Merge "recovery: drop log/logger.h"
am: 38b923ff6c

Change-Id: I92ddb6d9adef3f4a25588c76bade058914952b06