Merge "Fix tradefed dist-for-goals"