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