am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat now exports its headers."

* commit '4d4c45071b56089112bcfc687d635b966b810f4b':
  frameworks/base: libexpat now exports its headers.