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

Change-Id: Iab6b47d26daff772bc6a273f711eb6d137db5826