Merge branch 'android-msm-bullhead-3.10-nyc-mr1-security-next' into android-msm-bullhead-3.10-nyc-mr1 May 2017.1 Bug: 36138302
