am e1e3d278: Merge "Clean cruft out of makefiles."

* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
  Clean cruft out of makefiles.

diff --cc libs/gui/tests/Android.mk
Simple merge

diff --cc opengl/tests/lib/Android.mk
index a2752cd,9417ec1..e5124ad
--- 1/opengl/tests/lib/Android.mk
--- 2/opengl/tests/lib/Android.mk
+++ b/opengl/tests/lib/Android.mk
@@@ -15,13 -15,11 +15,11 @@@
  LOCAL_PATH:= $(call my-dir)
  
  include $(CLEAR_VARS)
+ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
  LOCAL_MODULE_TAGS := tests
  LOCAL_MODULE:= libglTest
 -LOCAL_SRC_FILES:= glTestLib.cpp
 +LOCAL_SRC_FILES:= glTestLib.cpp WindowSurface.cpp
  LOCAL_C_INCLUDES += system/extras/tests/include \
-     bionic \
-     bionic/libstdc++/include \
-     external/stlport/stlport \
        $(call include-path-for, opengl-tests-includes)
  
  LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES