Android 8.1.0 Release 0.12 (OPM1.171019.014,sailfish/marlin)
Merge branch 'android-msm-marlin-3.18-oc' into android-msm-marlin-3.18-oc-mr1

January 2018.1

Bug: 68996141
Change-Id: I6af91cc8e212cc97aeb8a61fb01c2daef3be2aaa
Signed-off-by: Pat Tjin <pattjin@google.com>