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

Change-Id: Id1571f658463c5110fc8a37d8e6d4697e0c22add