Snap for 6633916 from d24ff61ddffe3e7da04de5b970a8c434efd17faf to rvc-d1-release

Change-Id: Iec3b6829dee7ae634c56e8fae242ec4a627dfc86
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",
             ],
        },