am 4889c07b: Merge "frameworks/av: libexpat now exports its includes."

* commit '4889c07b795dac023a90df36f1cc7cffce8dbe0d':
  frameworks/av: libexpat now exports its includes.