Merge "Deprecate <cutils/log.h> and <utils/Log.h>"
am: 2e9d6011fe

Change-Id: Icbbf031b9fd97021de5d49cda60b80443442f3a8