Merge "defconfig: MSM8974: Add support for MSMSAMARIUM"