* commit '61d09810a7b478810adc15af2495136255377e25': Fix aapt to get expat header files from the approved location.