Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49
am: 6f06890343

Change-Id: I6e49f937f1145dba2c5500f25db5020fca7ceac0