STE Multimedia Fix

Conflicts:
	libs/binder/Parcel.cpp
	services/surfaceflinger/DisplayDevice.cpp