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

Change-Id: Ibc4c89be69129a3c1c728b21d8f9dd8563ed71d3