Merge "updater: Error out on underrun during patching."
am: a0404ecd16

Change-Id: Iad188c1bf399b9ac753d82621d2dd5122f1979be