Merge lomarbs wizardry crap
Conflicts:
	media/libstagefright/CameraSource.cpp