Automatically merging tracking-ilp32 into merge-linux-linaro

Conflicting files: