Merge "Fix libmedia and libstagefright to get expat header files from the approved location."