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