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

* commit '46cf0c1bf92e4e1bcf574bcb02c516646f0e9556':

Change-Id: Ifb18cfdc995047463966f87958196db7c8437ab0