Merge "Move build to plugin 2.2.0-alpha1" into nyc-dev
am: 01ad7edaae

* commit '01ad7edaae01b7fed0702b29466ecae833c241af':
  Move build to plugin 2.2.0-alpha1

Change-Id: Ibb24d118e62032a7657a401db7cfd6349095aff0