Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."