Merge \\"init: select usb gadget controller at run time\\" am: 916f5e873e
am: 91272bd435

Change-Id: I409161214cacbaac8fcb0f49d2c0a882f5d72dd7