am 46885106: am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread

* commit '46885106817e4a23e63188d49dba7838200ea48a':
  Clean Up VideoViewTest