Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev