Merge "msm: boards: Enable Krait Retention." into msm-3.4