Merge "Bug 6932: Fix *-library job"