Merge "defconfig: msm8610: enable msm_rmnet_bam"