Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread