Merge remote-tracking branch 'cm/cm-11.0' into merge_qcom

Conflicts:
	cmds/screenrecord/screenrecord.cpp
	media/libmediaplayerservice/Android.mk
	media/libstagefright/Android.mk