Merge changes from HEAD up to r218821.
This is to ease the merge of binutils 2.17 which is needed for an ARM EABI userland.