Merge e23ee25163bf7b3f7f2ecab3a89f5a48ff87e171 on remote branch

Change-Id: I7c8d3eb77fb456462a7257405ac677efbd53aaaf
diff --git a/Android.mk b/Android.mk
index 2169f06..092ffb7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +34,9 @@
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := AntHalService
-
+ifeq ($(filter 8% O% o%,$(TARGET_PLATFORM_VERSION)),)
+LOCAL_SDK_VERSION := system_current
+endif
 include $(BUILD_PACKAGE)
 
 endif # BOARD_ANT_WIRELESS_DEVICE defined