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

* commit '37b894c9f844829e008e69bc66bd160d32812743':
  Revert "frameworks/base: libexpat now exports its headers."