Update patch to build-commons-dev which no longer applied.