Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: 34ed144918  -s ours am: 8a8b99f07b  -s ours am: d7675e2f7a am: 38f16f10ff  -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6  -s ours am: a061a12398 am: bba06ee385 am: a731f0e9a2 am: cd957457b1
am: 41803ae6c1

Change-Id: I71e138c110c082b604603c12db4603af5e658e87
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9bfb163
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,24 @@
+cc_library_static {
+    name: "libgif",
+
+    sdk_version: "9",
+
+    srcs: [
+        "dgif_lib.c",
+        "egif_lib.c",
+        "gifalloc.c",
+        "gif_err.c",
+        "gif_hash.c",
+        "openbsd-reallocarray.c",
+        "quantize.c",
+    ],
+
+    cflags: [
+        "-Wno-format",
+        "-Wno-sign-compare",
+        "-Wno-unused-parameter",
+        "-DHAVE_CONFIG_H",
+    ],
+
+    export_include_dirs: ["."],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 437a8f7..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SDK_VERSION := 9
-
-LOCAL_SRC_FILES := \
-    dgif_lib.c     \
-    egif_lib.c     \
-    gifalloc.c     \
-    gif_err.c      \
-    gif_hash.c     \
-    openbsd-reallocarray.c     \
-    quantize.c
-
-LOCAL_CFLAGS += -Wno-format -Wno-sign-compare -Wno-unused-parameter -DHAVE_CONFIG_H
-LOCAL_MODULE:= libgif
-
-include $(BUILD_STATIC_LIBRARY)