Merge "Encoder/Decoder mismatch fix: need a separate copy of eob_counts." into nextgenv2