am 94fed352: am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""

* commit '94fed352f6f4dc1c53ea69a0cee3944f55b92d99':
  Revert "frameworks/base: libexpat now exports its headers."