Merge "Additional refactoring of MediaPlayer tests." into gingerbread