Merge "manifest: usb@1.2 -> usb@1.0" am: df7efdc8a2 am: f9e4c75141 am: 0f58cbbc9d
am: 7f14afb17e

Change-Id: I4a0005ac75c94739ae59c8c75f5d6f9a2b90d08b