Merge "Fix aapt to get expat header files from the approved location."