Snap for 8564071 from 6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 to mainline-extservices-release

Change-Id: I3571a0186387d6a211818b01d5f3ab7070162cea
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"],
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index ed4948f..188a26b 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Run with -DTEST=ON to build unit tests
 
 PROJECT ( YUV C CXX )	# "C" is required even for C++ projects
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
 OPTION( TEST "Built unit tests" OFF )
 
 SET ( ly_base_dir	${PROJECT_SOURCE_DIR} )