remove more aosp duplicated remote entries, arghh!