revert Bug 1020970 - Schedule all Android 2.3 armv6 tests, except mochitest-gl, on all trunk trees and make them ride the trains r=aki