Merge "Inline HTML5 Video support" into honeycomb-mr1