Merge "Merge "Move build to plugin 2.2.0-alpha1" into nyc-dev am: 01ad7edaae am: 57ac96d05a" into nyc-mr1-dev-plus-aosp
am: beb4f02e8d

* commit 'beb4f02e8db0e021f2b7c7e73df59c18c860133c':

Change-Id: I6330552dfd2250a05177f5ecf739b49f7588c2aa