Merge "msm: ocmem: Fix device addresses returned to Video subsystem." into msm-3.4