merge in pi-release history after reset to master
diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk
index e79e308..19ca946 100644
--- a/msm8909/libbt-vendor/Android.mk
+++ b/msm8909/libbt-vendor/Android.mk
@@ -65,7 +65,6 @@
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
 LOCAL_CLANG := false
-LOCAL_CXX_STL := none
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom