Merge branch 'tracking-perf-android' into merge-linux-linaro