Merge "board-8960: Merge secure and non secure firmware heaps." into msm-3.0