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

Change-Id: Ifcdbab431082648476b75b0083b7eb4f6aab5f3a