Merge "Change aapt flag to use new name"