Merge "Switch back to UI-driven AVD" into nyc-dev