Merge "blockimgdiff.py: Add a test case for ReviseStashSize()."