Remove upstreamed fixes #155

Job	Run time
Test Build / Test arm_cortex-a15_neon-vfpv4	17m 9s
Test Build / Test arm_cortex-a9_vfpv3-d16	19m 6s
Test Build / Test mipsel_24kc	15m 58s
Test Build / Test aarch64_generic	19m 19s
Test Build / Test i386_pentium-mmx	17m 58s
Test Build / Test mips_24kc	15m 14s
Test Build / Test riscv64_generic	19m 49s
Test Build / Test x86_64	18m 17s
Test Build / Test powerpc_8548	17m 20s
Test Build / Test powerpc_464fp	15m 56s
	2h 56m 6s

Provide feedback