While here regenerate the patch files as requested by portlint and add two library dependencies as requested by stage-qa.