XPERIA STE MULTIMEDIA 2

Conflicts:
	include/binder/Parcel.h
	include/gui/SurfaceComposerClient.h

Change-Id: I446e9f6ef76bdfb2f62993db481f6f63e6ae70f7