am: 70254281 * commit '70254281': Separate reading old and new files from bsdiff(). Change-Id: I811757fa07b74ef1a2a47e5c8a4815faf3f6d2a0