Merge "Switch fastboot to new A/B spec" into nyc-mr1-dev