Merge "Replace cutils/log.h with either android/log.h or log/log.h"
am: a05da2eea4

Change-Id: Iff7f7223f7db444393daef8a5036645688a80cc6