Merge "Use build_id as parent directory when building cache."