Merge branch 'android-msm-bullhead-3.10-security-next' into android-msm-bullhead-3.10

May 2018.1
Bug: 74404153

Signed-off-by: Siyuan Zhou <siyuanzhou@google.com>
Change-Id: I98e7e3bb405048e971437d2487fa90f332609523