Merge "defconfig: apq8084: Enable USB BAM support"