Merge "AAPT2: Improve diff command"