Merge "Copy vendor.sys.usb.adb.enabled to sys.usb.adb.enabled."