Merge "defconfig: msm8960: Enable the fault injection framework" into msm-3.0