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

* commit '5ba9df215298485099606592bba12a967f4fb930':
  Move build to plugin 2.2.0-alpha1

Change-Id: I2f9ba121c7c0dba574377985495b330ab066b32a