Merge "Resolve test crash in build/make/tools/compliance."