Fix sync error for duplicate aosp remote