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

Merge security-next into master @ 8451c8e for August 2016.2