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

Change-Id: I2147acff8dfb76ba106796b9b7eb7fb9de840097