Merge "libm: ARM: reorganize a bit to match ARM64"