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