Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22 am: 16a30c1ac8
am: fbc9758151

Change-Id: I911936217c6b47f48092319ff66edafaf0f7c395