Merge "releasetools: Fix the diff_worker progress report." am: e5b2ff2a97
am: 81c01a9adc

Change-Id: I9cb40fee8d4d5aaa759f4855bcc8d489370ed91c