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

PS2: fix oppo redeclaration

Change-Id: I5a608a38360efd79fad601d3850732bd449ebe89

Conflicts:
	media/libmedia/Android.mk
	media/libstagefright/ACodec.cpp
	media/libstagefright/Android.mk
	media/libstagefright/MediaExtractor.cpp
Revert "Merge remote-tracking branch 'cm/cm-11.0' into du44"

This reverts commit b926684cb4dd1e79ff55e034dc40c613f15cf550.
Merge remote-tracking branch 'cm/cm-11.0' into du44

PS2: fix oppo redeclaration

Change-Id: I5a608a38360efd79fad601d3850732bd449ebe89

Conflicts:
	media/libmedia/Android.mk
	media/libstagefright/ACodec.cpp
	media/libstagefright/Android.mk
	media/libstagefright/MediaExtractor.cpp