STE Multimedia Fix [1/4]

Conflicts:
	camera/CameraParameters.cpp
	include/camera/CameraParameters.h
	include/media/stagefright/OMXCodec.h
	media/libstagefright/ACodec.cpp
	media/libstagefright/OMXCodec.cpp