Merge "Replaced include log/logger.h with log/log.h in debuggerd"
am: 5fe1cebe7c

Change-Id: I9c5078ae7e9513767540897d791adac569bce894