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

Change-Id: I95eb36e55629a6cb9ae040a0f5bd345479a06fff