Native: OMX fix

Conflicts:
	libs/binder/Parcel.cpp
	libs/gui/Android.mk
	services/surfaceflinger/Android.mk
	services/surfaceflinger/DisplayDevice.cpp