Merge WebM input/output branch

Change-Id: I83a6f18d2314e5d97759b4ae49afaa52fd8b3c44