resolve merge conflicts of 20d55a7 to stage-aosp-master

Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59

diff --cc tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
index 39ad0ac,1e403eb..088f322
--- 1/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
--- 2/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
+++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
@@@ -38,14 -38,6 +38,8 @@@ LOCAL_SRC_FILES := contrast.cpp 
                  sobeloperator.cpp \
                  stats_scorer.cpp
  
- LOCAL_STATIC_LIBRARIES += \
-     libcutils
- 
- LOCAL_C_INCLUDES += \
-     system/core/include \
- 
 +LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter
 +
  LOCAL_NDK_STL_VARIANT := stlport_static
  
  include $(BUILD_SHARED_LIBRARY)