Merge "Fix typo in extra packages building"