Merge "Deprecate <cutils/log.h> and <utils/Log.h>" am: a8cff157ff
am: c0bec34fb6

Change-Id: I94008b9929aee0d4f927be745c01943fb4347cdd