Merge "defconfig: 7x27: Enable USB config options" into msm-3.0