Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main