Merge "Mark libbz as recovery_available for update_engine_sideload"