am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread

* commit '4f9a2d4f442879f2ad8dd42444595358051c159b':
  MediaPlayer test cleanup + new streaming test placeholder.