Merge 1004cb1dd731e8363703b93e0b465c2878cf081d on remote branch

Change-Id: I53b6924c5c1d5cf8195964fa34ddfca9e6c6a9b1
diff --git a/Android.bp b/Android.bp
index 0503e9c..7b4b22e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,6 +63,7 @@
                 "src/arm/linux/aarch32-isa.c",
             ],
             cflags: [
+                "-mcpu=generic",
                 "-march=armv7-a",
             ],
        },