Apply changes to migrate to upstream API.

Change-Id: Ibe6060a0d1c42b9725524de7f4cb95551b711717
diff --git a/Android.mk b/Android.mk
index 2bb4fd9..14604b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,9 +32,11 @@
 	libLLVMARMCodeGen	\
 	libLLVMARMAsmPrinter	\
 	libLLVMARMInfo	\
+	libLLVMARMDesc  \
 	libLLVMX86CodeGen	\
 	libLLVMX86AsmPrinter	\
 	libLLVMX86Info	\
+	libLLVMX86Desc  \
 	libLLVMX86Utils	\
 	libLLVMAsmPrinter	\
 	libLLVMSelectionDAG	\