am af4fa5d8: (-s ours) am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread

* commit 'af4fa5d83d70a9af9ede67c47eae72d1db0d6d74':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)