Merge "board-8064 msm: Overlap secure and non secure video firmware heaps." into msm-3.0