Merge "Update Fl multipatch build used in RPM full verify"