Merge "Move token_cache from cost_coeffs to MACROBLOCK"