Merge "Mark libverity_tree as recovery_available for update_engine_sideload"
am: 0dbba9a163

Change-Id: Ic2f90ba65533dc0cbe30404995d14a0a47e45467