Merge "joid: Change the order of functest and yardstick"