msm: rotator: Pass ION flags correctly for 2-pass buffer allocation

With updated ION interface, ION_SECURE needs to be passed as a
separate flag. Also, 2-pass buffer for secure session needs to be
allocated from CP heap instead of non-secure heap.

CRs-fixed: 502038
Change-Id: I8c5f945dc4d90ce640872e2cd0505ac32e82011d
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.384' of git://codeaurora.org/kernel/msm into cm-10.1

Conflicts:
	arch/arm/mm/dma-mapping.c
	include/media/msm_camera.h

Change-Id: I11e8e7b480c61802d6c887ce8b0f6bab9a59cfef

Conflicts:
	arch/arm/mm/dma-mapping.c