Merge \\"webm: avoid unnecessary variable-length arrays\\" am: 67fbddfdc2
am: 92076c3670

Change-Id: I38d4de1c5cd08fc27e45f31ee6a703ae2b09f2d9