Merge cherrypicks of [7429256, 7428998, 7429096, 7429097, 7429098, 7429219] into qt-release

Change-Id: Ic4d23483cb0aa9403cb00bdd88658c222bc1083a

services/mediacodec/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ _software_codecs := \
		libstagefright_soft_vorbisdec \
		libstagefright_soft_vpxdec \
		libstagefright_soft_vpxenc \
		libstagefright_softomx_plugin \

		# service executable
		include $(CLEAR_VARS)