DO NOT MERGE: Build a static bspatch for recovery. am: 2eea58f169
am: fb97da5a93  -s ours

Change-Id: Ia8374b9a7fa8ac750620827e1fdfbd0d5fa89bd0