STE: multimedia fix

Conflicts:
	include/binder/Parcel.h
	libs/gui/GLConsumer.cpp
	libs/ui/PixelFormat.cpp