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

Change-Id: Ib8102e58f5c5df97550aa200a392ff4e0d567f00