Merge "defconfig: msm8960: Disable USB Storage debug config"