Snap for 12987578 from 8cc222cd3e79fa5190f3aa039a03a4cbea6cfbe7 to studio-meerkat-feature-release

Change-Id: I0eb3347f94e82cdaa1c5f1746c095f0267b86091
diff --git a/Android.bp b/Android.bp
index da4b6c9..d565f7d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,10 +61,10 @@
             cflags: ["-O3"],
         },
         arm64: {
-            srcs: ["arm/*",],
+            srcs: ["arm/*"],
             cflags: ["-O3"],
             exclude_srcs: [
-                "arm/filter_neon.S"
+                "arm/filter_neon.S",
             ],
         },
         x86: {
@@ -113,7 +113,7 @@
     min_sdk_version: "apex_inherit",
     apex_available: [
         "com.android.mediaprovider",
-        "//apex_available:platform"
+        "//apex_available:platform",
     ],
 }
 
@@ -137,7 +137,10 @@
     gtest: false,
     srcs: ["pngtest.c"],
     name: "pngtest",
-    cflags: ["-Wall", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
     shared_libs: [
         "libpng",
         "libz",
@@ -146,7 +149,7 @@
 
 cc_fuzz {
     name: "libpng_read_fuzzer",
-    host_supported:true,
+    host_supported: true,
 
     static_libs: [
         "libpng",