Merge "init: select usb gadget controller at run time"