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

Change-Id: If7234621fcb54a3edd141684a1d4fbf52b9599e1