Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6 am: 7e92307cd8
am: 430f62090c

Change-Id: I8bbed9204718da324f0bdeceb7b8156cb315e900