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

Change-Id: Ibf2aa69cc07dff9a0686a846a76681b193e52856