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