AnyKernel2: sync unpack/repack fixes from
https://github.com/osm0sis/AnyKernel2/commit/7e80ad9fa26142b56fea654c16d8dc889ba1cd35