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

Change-Id: Ibb1ffeb5c5e13578b4669c5525d270c4f3b7175d