Merge "Benchmark: Update EOS condition for SDK encoder" am: 5b16d6b28d am: fefe8e8e6e am: 944919cb51

Change-Id: I67e2a2d7ea0514381724fb9d869a15c75a2acb18