Merge branch 'android-x86_64-fugu-3.10-security-next' into android-x86_64-fugu-3.10 Security February 2017.1