Merge "Fix unittest for blockimgdiff"
am: 36bcb78eb9

Change-Id: If32bcc2356fc4b251481b3b7d664af6736bc3caf