Merge July 2017 security patches

Merge 'android-msm-shamu-3.10-security-next' into
'android-msm-shamu-3.10'

July 2017 security patches.