Merge "AAPT2: Add tool to fix positional argument issues"