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

Change-Id: Ifd9ca692dc57ce161df198586180b1a3b68ba2fc