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

November 2018.2

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