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

Conflicts:
	include/media/stagefright/DataSource.h
	media/libstagefright/DataSource.cpp
	media/libstagefright/OMXCodec.cpp
	services/audioflinger/Threads.cpp
	services/audioflinger/Tracks.cpp