Merge "Fix MediaStore_Audio_Playlists_MembersTest" into gingerbread