Merge "linux: regenerate i686 arm toolchain" into gingerbread