Merge branch android10-qpr3-release

Change-Id: I9b7933ef45ae902654e1944251acb9438c2e24c7
diff --git a/coders/Android.bp b/coders/Android.bp
index 09e20e5..6e27324 100644
--- a/coders/Android.bp
+++ b/coders/Android.bp
@@ -17,7 +17,7 @@
 
     sdk_version: "24",
 
-    srcs: ["*.c"],
+    srcs: ["dds.c", "jpeg.c", "xc.c"],
 
     exclude_srcs: [
         // Removed because requires LIBTIFF
diff --git a/coders/coders-list.h b/coders/coders-list.h
index b005230..aa91e3a 100644
--- a/coders/coders-list.h
+++ b/coders/coders-list.h
@@ -14,6 +14,11 @@
   limitations under the License.
 */
 
+#if defined(__ANDROID__)
+AddMagickCoder(DDS)
+AddMagickCoder(JPEG)
+AddMagickCoder(XC)
+#else
 AddMagickCoder(AAI)
 AddMagickCoder(ART)
 AddMagickCoder(AVS)
@@ -183,3 +188,4 @@
 #endif
 AddMagickCoder(YCBCR)
 AddMagickCoder(YUV)
+#endif