Merge "Fix vendor contexts files in mixed build"