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

Change-Id: I8271ed038f3bfb8bd14807bd2d99c6dbf617691a