Merge "Mark libverity_tree as recovery_available for update_engine_sideload"