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

* commit '2af2afce5961d7a98e34c0b1639e14291355b18f':

Change-Id: I74ab8416b001259ed03eb960782b145a4b848f0b