Merge additional July 2017 security update.

Merge 'android-x86_64-fugu-3.10-nyc-mr1-security-next'
to pick up missed patch.

July 2017.1

Bug: 38137582