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

* commit '2af54fa7d6701fbefe26be56484866807bfd9364':
  Revert "Move build to plugin 2.2.0-alpha1"

Change-Id: I1119b572348eec7df676211b41268049b0c001cc