Merge "Merge "Move build to plugin 2.2.0-alpha1" into nyc-dev am: 01ad7edaae am: 5ba9df2152" into nyc-mr1-dev-plus-aosp
am: a93fd1e8eb

* commit 'a93fd1e8eb8d7d27e9c20916203f783289ec24ab':
  Move build to plugin 2.2.0-alpha1

Change-Id: Ic33b5983782c36b6af5154b6252023afdc94c02c