Merge "Make patchoat use the sht_entsize when patching."