Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596
am: 74b665fef1

Change-Id: I4d9b7eb0c73faee8c7044690750560840fa4d820