Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib67dfc239325e73eb90dc3fcc1607c4d09d089f9
diff --git a/files/Android.bp b/files/Android.bp
index c1aa8c6..20b8c23 100644
--- a/files/Android.bp
+++ b/files/Android.bp
@@ -86,6 +86,12 @@
         "-DHAVE_JPEG",
     ],
 
+    arch: {
+        arm: {
+            cflags: ["-mfpu=neon"],
+        },
+    },
+
     shared_libs: ["libjpeg"],
 
     export_include_dirs: ["include"],