Merge "Fix static-executable test to not use support lib."