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

Change-Id: I38d4611c51ec511169c727dbfcbe6c2243fcab62