Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi

December 2018.1

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