Merge "releasetools: Fix a bug in blockimgdiff.HeapItem."