Merge changes I1ba07fb8,I3ebfd979 into msm-3.4

* changes:
  msm_fb: display: Add ion support for PPP
  msm: QDSP5: audio: Migrate to ION