Merge "Revert "msm:board-msm7x27a: Increase pmem for camera memory constraints"" into msm-3.0