Merge "Mark libbspatch as recovery_available for update_engine_sideload"