Merge "Mark libbspatch as recovery_available for update_engine_sideload" am: 3a44e8e51b
am: 78c18d79aa

Change-Id: I219ed107015e89bc6f3ad53de405a4f5461b4fed