Automatically merging tracking-big-LITTLE-MP-v5 into merge-linux-linaro-core-tracking

Conflicting files: