Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1

December 2018.1

Bug: 117289242
Change-Id: I66167c8107907a090a544a0f9c325416b45e3ee0
Signed-off-by: Siqi Lin <siqilin@google.com>