Merge fix: re-add vsync callback to enable moto cmd panels

It was erased by c31210d8e10cb6c8e85937d5c43cdd27d404edf3
Revert "Revert "IKHSS7-24198: set qinara/asanti scanline to avoid tearing.""

This reverts commit 14d378a0b9fc80567b6a3a54b7a8e02aba55864d.

Conflicts:

	drivers/video/msm/mipi_mot_cmd_auo_hd_450.c
	drivers/video/msm/mipi_mot_cmd_auo_qhd_430.c
ion: add hack for IOMMU camera

liboemcamera requests memory from the CAMERA or IOMMU heaps, which
we cannot provide currently. Since we cannot change liboemcamera, remap
to CP_MM heap if CAMERA heap is requested
Adapted from HTC msm8960 kernel

Change-Id: I12b00799b6844d0d09f2c55ad19cf31e556e5bb5
Camera:  increase ION SF heap size to 80MB

Change-Id: I0f169f49f3e839956fad2a4c30a57001785c4edc
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1