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

* commit '8b570fd47c096a3d54ccc0f9d2fa71c0805339f2':
  MediaPlayer test cleanup + new streaming test placeholder.