STE Multimedia Support (2/4)

PS6: remove whitespace
Change-Id: I7901085d51352860b1ee584952ffa10d84a1a8da
Fix compiling error

Change-Id: I5b5c1eec0c534f60b12863a9c2c77254d644c240
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4

Conflicts:
	libs/gui/Android.mk