am 89116fe6: am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread * commit '89116fe6': MediaPlayer test cleanup + new streaming test placeholder.