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

November 2017.1

Bug: 65558923
Change-Id: I57e57afbaf3bbae599bf87675562f5217c062243
Signed-off-by: Andrew Lehmer <alehmer@google.com>