Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"