Merge "Clean up unnecessary build dependencies."