Merge "defconfig: add S5k4e1 defconfig for msm8x12 qrd board"