backout 2b55725563a1
backout 6a73eafc19ed
Bug 970925 - convert testing/mochitest/android.json to mochitest.ini - first pass at androidx86.json. r=gbrown