Merge "usb_bam: qdss: Add support for OCIMEM type"