Merge "ARM: dma-mapping: remove custom consistent dma region"