Remove upstreamed fixes #164

Job	Run time
Test Build / Test aarch64_generic	5s
Test Build / Test arm_cortex-a15_neon-vfpv4	1s
Test Build / Test mips_24kc	1s
Test Build / Test arm_cortex-a9_vfpv3-d16	6s
Test Build / Test mipsel_24kc	6s
Test Build / Test i386_pentium-mmx	1s
Test Build / Test powerpc_8548	1s
Test Build / Test powerpc_464fp	1s
Test Build / Test riscv64_generic	1s
Test Build / Test x86_64	1s
	24s

Provide feedback