Repeal CyanogenMod's Divorce with Legacy Devices <_< SMH

 Please enter the commit message for your changes. Lines starting

Change-Id: Iec62301c9265d11a277cd1b7f3869711a3050f0c

Conflicts:
	camera/CameraParameters.cpp
	include/camera/CameraParameters.h
	media/libstagefright/CameraSource.cpp