Merge branch android-msm-bullhead-3.10-security-next into android-msm-bullhead-3.10

December 2016.1