Merge "Security Vulnerability - CVE-2012-6702 and CVE-2016-5300" into security-aosp-mnc-mr1-release