Merge "Build a static bspatch for recovery." am: 05ff27aaf4 am: f26b5b670a
am: 769e011df4

Change-Id: I5eb034cd481d6c0a6f56d3319970c089d9dd2b87