Merge "blockimgdiff: Factor out the diff_worker"
am: 8ab919dcce

Change-Id: I590dac85679de6209a3ba00052a309f41567cbae