Merge "Rename flags in aapt2-optimize for more accuracy and consistency."