Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 am: ec6a47ae46  -s ours
am: ef674454a1

Change-Id: I0eba33f1c585254315cdcf4bbad0a6e70d4c4024