Update to bmake-20210621
MFC after: 1 week
(cherry picked from commit 68c4481aac28f5a088553b9c31579f6fbc8500fd)