Updated linaro tool-chain.
Fix merge conflict.