Bug 1024091 followup, run Android 2.3 armv6 tests on trunk trees and make them ride the train for the current trunk, not the next trunk, r=Callek