am f8297ba0: am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread

Merge commit 'f8297ba011af959331873e09612665a486e1a1a7'

* commit 'f8297ba011af959331873e09612665a486e1a1a7':
  Upgrade to the latest .webm project code.