[AC21.4] Further parallel build dependency fix.