Work on separating the arm-linux-androideabi and arm-eabi toolchain versions better.