Merge "usb_bam: Fix compilation errors" into msm-4.9