Merge remote-tracking branch 'phh/master' into HEAD

diff --git a/Sharp/S2-los/Android.mk b/Sharp/S2-los/Android.mk
index 4ab5e56..4f45e9d 100644
--- a/Sharp/S2-los/Android.mk
+++ b/Sharp/S2-los/Android.mk
@@ -4,4 +4,5 @@
 LOCAL_PACKAGE_NAME := treble-overlay-sharp-s2-los
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)