STE_MULTIMEDIA:STEP1

Conflicts:
	media/libmediaplayerservice/StagefrightRecorder.cpp