Snap for 12821328 from f99d5860103a097a67d1020eb801178f930291ab to simpleperf-release

Change-Id: Ic32505352b9fa4cbd94f11ca492cf27e61dec21f

Android.bp

diff --git a/Android.bp b/Android.bp
index 6d59c06..fd36b23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,6 +77,7 @@
         "-Wno-null-pointer-arithmetic",
         "-Wno-register",
         "-Wno-shift-count-overflow",
+        "-Wno-single-bit-bitfield-constant-conversion",
         "-Wno-sign-compare",
         "-Wno-strict-prototypes",
         "-Wno-tautological-compare",

Include/asdl.h

diff --git a/Include/asdl.h b/Include/asdl.h
index 84e837e..9a6ec4a 100644
--- a/Include/asdl.h
+++ b/Include/asdl.h
@@ -5,9 +5,7 @@
 typedef PyObject * string;
 typedef PyObject * object;
 
-#ifndef __cplusplus
-typedef enum {false, true} bool;
-#endif
+#include <stdbool.h>
 
 /* It would be nice if the code generated by asdl_c.py was completely
    independent of Python, but it is a goal the requires too much work