Merge "Move some common USB configuration logic to init.rc"