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

* commit '88fda171236cbd9c267030c9489e71787ee00f54':
  Revert "Move build to plugin 2.2.0-alpha1"

Change-Id: I803c392ec62db149958169f3bf619613a60d9530