Merge "Add bspatch_fuzzer" am: c82a7587b8
am: 9a5d296683

Change-Id: I274669640738d891c59549e27c9b6f9818753807