Merge "Use bspatch from external/bsdiff."
am: f9962dbfe2

Change-Id: I21e6de951b22673fe48ff8f7db418e22d233ee58