Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966