Merge "ARM: dma-mapping: remove unconditional dependency on CMA" into msm-3.4