Merge "Revert "defconfig: msm: Enable mass storage support for APQ8009""