Merge "Add multithread support to call imgdiff with block-limit"
am: 5d60cd2d3e

Change-Id: I9fe115f791a913f483626fe5e2b1043b8e799cd8