Post landing fixes

runtime/vm/signal_handler.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_SIGNAL_HANDLER_H_
 #define VM_SIGNAL_HANDLER_H_
 
 #include "vm/allocation.h"
 #include "vm/globals.h"
 
 #if defined(TARGET_OS_LINUX)
 #include <signal.h>  // NOLINT
 #include <ucontext.h>  // NOLINT
 #elif defined(TARGET_OS_ANDROID)
-#include <signal.h>  // NOLINT
-#include <ucontext.h>  // NOLINT
+#include <asm/signal.h>  // NOLINT
+#include <asm/sigcontext.h>  // NOLINT
 #elif defined(TARGET_OS_MACOS)
 #include <signal.h>  // NOLINT
 #include <sys/ucontext.h>  // NOLINT
 #elif defined(TARGET_OS_WINDOWS)
 // Stub out for windows.
 struct siginfo_t;
 struct mcontext_t;
 struct sigset_t {
 };
 #endif
@@ skipping 19 matching lines @@
   ~ScopedSignalBlocker();
 
  private:
   sigset_t old_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_SIGNAL_HANDLER_H_