am 1c6d9005: am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now."

* commit '1c6d9005d30ef3f9cc30fb89e78751b7033a453f':
  aapt: expat exports its header files now.