Merge "Attempt to fix runtest for native tests."