OMX changes

Change-Id: I73e9e9ceb3a7c8a7e1bc67f658d23280646038e5

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