Merge "Mark libpuffpatch as recovery_available for update_engine_sideload"