Merge "Move USB framework support from android.hardware to android.hardware.usb package"