Merge remote-tracking branch 'goog/qcom/release/LA.UM.6.3.R1.003751.1'

Change-Id: I8efc408f00d10dee13f9992e4d51a35f7b763439
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