Merge "Add com.android.future.usb.accessory api files"