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

Change-Id: I75890537b17cd9ea6c081a0926320730bb01ab8a