Merge "common: dma-mapping: make dma_common_contiguous_remap more robust" into msm-4.8