Change-Id: Ie4b62e86f835d96a33492d68aef55cf38f855832
Change-Id: I9481501c325a49d70ce28214c7a2ad9926c4e036
This is a preparation to add more media codecs variants. Change-Id: I6a7a3e3ff8e23db7393fc6d99822a0238d81ff53