Merge "Allow bcc to provide arm64 codegen" am: 95e994f426 am: 973789f45a am: e0af922103

Change-Id: Id77a62aeb98f29429abfca1fe39ee329bf487227
diff --git a/Android.bp b/Android.bp
index 8761b29..28f1b8a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,6 +69,7 @@
             cflags: [
                 "-DFORCE_ARM_CODEGEN",
                 "-DARCH_ARM_HAVE_VFP",
+                "-DPROVIDE_ARM64_CODEGEN",
             ],
             neon: {
                 cflags: [