Merge "Revert "Move build to plugin 2.2.0-alpha1"" into nyc-dev am: 4399c6b66b am: 2af2afce59
am: 2b6f54fdab

* commit '2b6f54fdab0b366f583ba2cbe12c3515a01e1aac':

Change-Id: Ifb4efbe936ca1d21228c98da8bf33d109cb67532