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

Change-Id: I175c5735f9165bca6d041595748d46bd870b3403