Merge changes I096cdf2b,I77a2fda1 into msm-3.4

* changes:
  msm: ocmem: Refactor the GPU MPU workaround to a stub
  msm: clock-8974: Add a voter clock for the OCMEM core