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

* commit '57ac96d05acc798511de3abd9f1d2f67ad0996c1':
  Move build to plugin 2.2.0-alpha1

Change-Id: Ia0505c9a776d6d1c8ca9ab0131a4a22b2e0f4baf