Merge "jf: add hardware hdr support" into cm-10.1
Conflicts:
	overlay/packages/apps/Camera/res/values/config.xml

Change-Id: I1cad035438738c63b6c4a37034d09d2090010dd3