Merge "defconfig: 9615: allow both hsic and usb to compile as modules." into msm-3.0