Merge "AAPT2: Add convert command"