Automatically merging tracking-previous-armlt-arm-arch-fixes into merge-linux-linaro-tracking

Conflicting files: