620a424036
Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name. Change-Id: I3857422bfe9173baae53e4f3d258b055f51ad9f2