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

Change-Id: Ic75ae349a3687df02aa06e6aca877e915548a6d2