Merge "Remove Broken MediaControllerTests" into gingerbread