Merge "add support for test suites with 'prebuilt tools'"