STE Multimedia Support (2/4)

Change-Id: I7901085d51352860b1ee584952ffa10d84a1a8da

Conflicts:
	libs/gui/GLConsumer.cpp
	services/surfaceflinger/DisplayDevice.cpp