Merge "Merge "Indicate that all emulator images support USB" into nyc-dev am:...
Merge "Merge "Indicate that all emulator images support USB" into nyc-dev am: 513e69ec am: fbcb931c" into nyc-mr1-dev-plus-aosp
am: 76cf163d
* commit '76cf163d':
Change-Id: I3d9aecf30093ebd71f39c19bdf9a36862e6dd1c1