Merge "AAPT2: Refactor flags into commands"