Merge "defconfig: 8974: Enable USB BAM support" into msm-3.4