Merge "benchmark: Fix NPD in Encode::deInitCodec()"