am def2be5b: Merge "Suppress VideoVideoTest#testOnKeyDown" into gingerbread

* commit 'def2be5bf63616a2f4ff689a62937875c2949f09':
  Suppress VideoVideoTest#testOnKeyDown