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

Change-Id: I79039dbb7e9d660193b54d16e5fce380140c75a1