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

Change-Id: I263fa3a582bbff546f1281205b539258ee5dab49