merge jb-mr2-dev

Change-Id: I8aefc901a0185baf11cd1f8bb47a46122fc58f1d
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>

Conflicts:
	include/video/msm_hdmi_modes.h