Merge "msm: kgsl: allow consistent CPU and GPU mappings"