Merge commit 'goog/master' into merge_master
tree: b2f42dc6c581b7cecbde68d1d3cb594344d76c70
  1. include/
  2. media/