Merge "Indicate that all emulator images support USB" into nyc-dev
am: 513e69ec69

* commit '513e69ec69a7e5c61888668a4b16ccab6073419c':
  Indicate that all emulator images support USB

Change-Id: If3567c18390a3875f5523e3a91ad4514d7c59c2d