Merge "Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input" into security-aosp-mnc-mr1-release