Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h"
am: b5db125860

Change-Id: I55fd176e62326df38194486d86a9d3a8f72270ea