Merge "mach: increase camera heap size to 66 MB." into msm-3.0