Merge "Fix build id check for libraries."