Merge "defconfig: arm: msm: Enable Diag and memshare driver"