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

Change-Id: I1523bfc0794fe8463fb6134ae8d8c5902947de8b