am 5c085ad1: am fd48021d: am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit '5c085ad1':
Fix libmedia and libstagefright to get expat header files from the approved location.
