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

* commit '57ac96d05acc798511de3abd9f1d2f67ad0996c1':

Change-Id: I5b307dbc411638a3f277d89dd9ce8aa312d5629d