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

* commit '01ad7edaae01b7fed0702b29466ecae833c241af':
  Move build to plugin 2.2.0-alpha1

Change-Id: I2b84bccd6a2246441d5580776d87928d6b99f8e8