Merge "msm: 8930: Correct the sd card detect line configuration" into msm-3.0