resolved conflicts for merge of 9f2a2259 to lmp-mr1-dev-plus-aosp

Change-Id: I1aa72203e0a24250b78e7af866d1961ecd272472
diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index 26df045..bedef58 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -38,7 +38,7 @@
 // impacts where samples will occur. Reducing the count as much as possible improves profiler
 // accuracy in tools like traceview.
 // TODO: get a compiler that can do a proper job of loop optimization and remove this.
-#define SUSPEND_CHECK_INTERVAL 1000
+#define SUSPEND_CHECK_INTERVAL 96
 #endif
 
 #if defined(__cplusplus)