Clean up test makefiles.

The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02

libs/androidfw/tests/Android.mk

@@ -13,11 +13,6 @@ shared_libraries := \
     libcutils \
     libutils \
     libui \
-    libstlport
-
-static_libraries := \
-    libgtest \
-    libgtest_main
 
 $(foreach file,$(test_src_files), \
     $(eval include $(CLEAR_VARS)) \

services/input/tests/Android.mk

@@ -16,19 +16,10 @@ shared_libraries := \
     libhardware_legacy \
     libui \
     libskia \
-    libstlport \
     libinput \
     libinputservice
 
-static_libraries := \
-    libgtest \
-    libgtest_main
-
 c_includes := \
-    bionic \
-    bionic/libstdc++/include \
-    external/gtest/include \
-    external/stlport/stlport \
     external/skia/include/core
 
 module_tags := eng tests