Add missing includes and libs to Android.mk

I probably shouldn't need to add libc, but it shouldn't hurt either, and I
*do* need it. Otherwise I think my screwed up local build system is using
the wrong one. One day I'll actually get AOSP or Cyanogen to build properly
and I won't have to suffer with this cobbled-together pile of crap that I'm
using...

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Android.mk

@@ -26,12 +26,13 @@ common_C_INCLUDES += \
 	external/openssl/include \
 	external/openssl/crypto \
 	external/zlib \
-	frameworks/base/cmds/keystore
+	frameworks/base/cmds/keystore \
+	system/core/include
 
 common_SHARED_LIBRARIES := libcutils \
 	libz \
 	libicuuc \
-	libicui18n
+	libicui18n libgabi++ libc
 
 ifneq ($(TARGET_SIMULATOR),true)
 	common_SHARED_LIBRARIES += libdl