Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread