am 40d48e17: Merge "Stop using stlport."

* commit '40d48e177f243c6093a45301db122a0475cc1124':
  Stop using stlport.
diff --git a/modules/sensors/Android.mk b/modules/sensors/Android.mk
index 65f699b..6978293 100644
--- a/modules/sensors/Android.mk
+++ b/modules/sensors/Android.mk
@@ -35,16 +35,11 @@
     libcutils \
     libdl \
     liblog \
-    libstlport \
     libutils \
 
 LOCAL_PRELINK_MODULE := false
 LOCAL_STRIP_MODULE := false
 
-LOCAL_C_INCLUDES := \
-    external/stlport/stlport \
-    bionic \
-
 include $(BUILD_SHARED_LIBRARY)
 
 endif # USE_SENSOR_MULTI_HAL