[R21.4] [PATCH] Further parallel build dependency fix.