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

Change-Id: I5f0ffb78092d7d3e0425cfce3c4f614b81b0ff5e