Merge "msm: board 8960 and 8064: Increase ion heap size for audio." into msm-3.0