am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread

* commit 'a75737b0ae56dddefc5915f81c14a92b785b42d0':
  Clean Up VideoViewTest