Merge "Make encoder buffer allocation dynamic"