Merge "C++14 is the default now." am: 8183157774 am: 992916a6af
am: 7fe181bf17

Change-Id: I6f5c08e4122a0eacaee442a4053d1bc3a2f3f758
diff --git a/tests/tests/rscpp/librscpptest/Android.mk b/tests/tests/rscpp/librscpptest/Android.mk
index 633ee23..8ac550b 100644
--- a/tests/tests/rscpp/librscpptest/Android.mk
+++ b/tests/tests/rscpp/librscpptest/Android.mk
@@ -44,7 +44,6 @@
 LOCAL_C_INCLUDES += frameworks/rs/cpp
 LOCAL_C_INCLUDES += frameworks/rs
 
-LOCAL_CPPFLAGS := -std=c++11
 LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter
 
 LOCAL_SHARED_LIBRARIES := libdl liblog