Add PNG and 9-patch support

Change-Id: I9ecdfdf82b82d59084490da518e167e256afd5f2
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index 9cea176..14f558e 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -29,12 +29,14 @@
 	BinaryResourceParser.cpp \
 	ConfigDescription.cpp \
 	Files.cpp \
+	Flag.cpp \
 	JavaClassGenerator.cpp \
 	Linker.cpp \
 	Locale.cpp \
 	Logger.cpp \
 	ManifestParser.cpp \
 	ManifestValidator.cpp \
+	Png.cpp \
 	ResChunkPullParser.cpp \
 	Resolver.cpp \
 	Resource.cpp \
@@ -69,7 +71,10 @@
 	XliffXmlPullParser_test.cpp \
 	XmlFlattener_test.cpp
 
-cIncludes :=
+cIncludes := \
+	external/libpng \
+	external/libz
+
 hostLdLibs :=
 
 hostStaticLibs := \
@@ -78,7 +83,8 @@
 	liblog \
 	libcutils \
 	libexpat \
-	libziparchive-host
+	libziparchive-host \
+	libpng
 
 ifneq ($(strip $(USE_MINGW)),)
 	hostStaticLibs += libz