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

Change-Id: Idbb3ed146b147300d8f472958a5b888c07f5a684