Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08