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

Change-Id: Ifd98e0cd8d573aa8796def0d853eebbdbff8aca5