Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: 4bf8f12b1d
am: f6df708e86

* commit 'f6df708e865240e110e0ea58664b6718c71d62e3':
  Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input

Change-Id: I35585e098b6cac1d527c2f2d7c36a161b28443bd