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

Change-Id: I2ed84d8aeb8042950c906abb5ee6808291d0fbf0