Merge "AAPT2: Add diff command" into nyc-mr1-dev