Cleanup after moving to gcc-arm-embedded 4.8