Merge "Delete some unused cruft from OldAndroidMonitorTest."