Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well."