Merge "Indicate that all emulator images support USB" into nyc-dev