Merge commit '61f704a28f9d984eef9ee645a6e4e761130a5609' into HEAD

Change-Id: I7d27a79c89740aa041c42e1396e8bfc89bc1d4f4
diff --git a/modules/sensors/Android.mk b/modules/sensors/Android.mk
index 9942d39..da85e2e 100644
--- a/modules/sensors/Android.mk
+++ b/modules/sensors/Android.mk
@@ -17,7 +17,6 @@
 LOCAL_PATH := $(call my-dir)
 
 ifeq ($(USE_SENSOR_MULTI_HAL),true)
-ifneq ($(PRODUCT_FULL_TREBLE),true)
 
 include $(CLEAR_VARS)
 
@@ -45,10 +44,6 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-else
-$(warning Treble enabled device have built-in sensor multihal support. \
-          USE_SENSOR_MULTI_HAL should not be set.)
-endif # PRODUCT_FULL_TREBLE
 endif # USE_SENSOR_MULTI_HAL
 
 include $(call all-makefiles-under, $(LOCAL_PATH))