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

Change-Id: I85dc4f821fc9a8026c7c7d5f37d4314441db2cf1