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

* commit '188af044685802cfd5266fe45b68528a2413ce3d':
  Revert "frameworks/base: libexpat now exports its headers."