Merge July 2017 security updates.

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

July 2017.1

Bug: 38137577