Merge "arm64: Enable dma_mmap_nonconsistent" into msm-4.9