misc: Re-order job definitions

Change-Id: I68768d51ac51a7926e2a4676ae9c3dce440512f5