Revert the previous 2 temporary changes.

libjpeg.gyp

Index: libjpeg.gyp
diff --git a/libjpeg.gyp b/libjpeg.gyp
index 4880c30d4eedbbbd7daa93b440ab49d28ad13c23..03dc537497c8030b2425e59a4d31214fb344d80c 100644
--- a/libjpeg.gyp
+++ b/libjpeg.gyp
@@ -25,6 +25,7 @@
       'defines': [
         'WITH_SIMD',
         'MOTION_JPEG_SUPPORTED',
+        'NO_GETENV',
       ],
       'sources': [
         'jcapimin.c',
@@ -156,11 +157,11 @@
           ],
         }],
         # The ARM SIMD implementation can be used for devices that support
-        # the NEON instruction set. This is done dynamically by probing CPU
-        # features at runtime, so always compile it for ARMv7-A devices.
+        # the NEON instruction set. This can safely be done dynamically by
+        # probing CPU features at runtime, if you wish.
         [ 'target_arch=="arm"', {
           'conditions': [
-            [ 'armv7 == 1 or arm_neon == 1', {
+            [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
               'sources': [
                 'simd/jsimd_arm.c',
                 'simd/jsimd_arm_neon.S',
@@ -265,11 +266,6 @@
             ],
           },
         }],
-        [ 'OS=="android"', {
-          'defines': [
-            'NO_GETENV',  # getenv() is not thread-safe.
-          ],
-        }],
       ],
       'rules': [
         {