Merge remote-tracking branch 'goog/qcom/release/LA.UM.6.3.R1.00391.1' into HEAD

Change-Id: I2ed187125b06e4f2504a5b9122234a8c15b9734f
diff --git a/os_pickup.mk b/os_pickup.mk
new file mode 100644
index 0000000..6103ffb
--- /dev/null
+++ b/os_pickup.mk
@@ -0,0 +1,4 @@
+ifeq ($(TARGET_BOARD_PLATFORM),sdm845)
+LOCAL_PATH := $(call my-dir)
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif