Merge remote-tracking branch 'upstream/master' into mozbench-android
Merge branch 'mozbench-android' of https://github.com/mccricardo/mozbench into mozbench-android
Revert "Merge remote-tracking branch 'upstream/master' into mozbench-android"

This reverts commit 10c71675576fb07f8545239e7aad711730852be8, reversing
changes made to fd00a93ff9733ad0aa9124d34d382eff99cae34c.