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

* commit '1a1461058e6b5a9be28f01cc0b87900a011ea585':
  AAPT2: Add diff command

Change-Id: If3d31d9cb52cb49e0238d01c5391e25cf36a7222