Merge "defconfig: msm8974: Add support for cpp device driver"