[automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4
am: 260d4ba55f  -s ours

Change-Id: I5cb92b10097463148a9b2cfe694de470d3dbec90