fix video colors

Conflicts:

	media/libstagefright/colorconversion/SoftwareRenderer.cpp