Add arm-linux-androideabi-4.6 back

Needed for janice
Merge remote-tracking branch 'origin/kitkat' into blood