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

* commit '220b61f14387e492be4ae8b819a5f96ca9b8dc36':
  frameworks/base: libexpat now exports its headers.