Merge "Fix broken patch extraction for multipatch-build"