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

* commit '4399c6b66b10023fa6520f216ea79d8158638c4f':
  Revert "Move build to plugin 2.2.0-alpha1"

Change-Id: I1db4442199f0d73dfc3a59f3d8bcf0e2c5d684cc