Fix build.

This project is still using stlport (without telling the build system
about it), which was causing (broken) stlport headers to override
libc++ headers, leading to a broken copy of std::enable_if, which in
turn caused <atomic> to fail to compile. Since this project has
prebuilts that will need to be updated before this project can
actually move away from stlport, tell the build system that it is
still using stlport for now.

Bug: 18433002
Change-Id: I38b356428977ed2184eb28a07bd5e7424a4ace8d

libwvdrmengine/Android.mk

@@ -12,8 +12,6 @@ LOCAL_MODULE := libcdm_utils
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_C_INCLUDES := \
-    bionic \
-    external/stlport/stlport \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
@@ -31,6 +29,7 @@ LOCAL_SRC_FILES := third_party/stringencoders/src/modp_b64w.cpp \
     $(SRC_DIR)/properties_android.cpp \
     $(SRC_DIR)/timer.cpp \
 
+LOCAL_CXX_STL := stlport
 include $(BUILD_STATIC_LIBRARY)
 
 # -----------------------------------------------------------------------------
@@ -42,10 +41,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libcdm_protos
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_C_INCLUDES := \
-    bionic \
-    external/stlport/stlport
-
 LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
 
 generated_sources_dir := $(call local-generated-sources-dir)
@@ -60,6 +55,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
     $(generated_sources_dir)/proto \
     $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src
 
+LOCAL_CXX_STL := stlport
 include $(BUILD_STATIC_LIBRARY)
 
 # proto_generated_headers is a build system internal variable defined in
@@ -80,8 +76,6 @@ LOCAL_SRC_FILES := \
   src/WVUUID.cpp
 
 LOCAL_C_INCLUDES := \
-  bionic \
-  external/stlport/stlport \
   frameworks/av/include \
   frameworks/native/include \
   vendor/widevine/libwvdrmengine/cdm/core/include \
@@ -104,12 +98,13 @@ LOCAL_SHARED_LIBRARIES := \
   libcutils \
   libdl \
   liblog \
-  libstlport \
   libutils \
   libstagefright_foundation \
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
 
+LOCAL_CXX_STL := stlport
+
 LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
 
 LOCAL_MODULE := libwvdrmengine