Fix remaining merge inconsistencies with newlib-2.1

Stick with the epiphany implementation we had in newlib 1.20. It seems
more up to date and does work.