Merge "Deprecate <cutils/log.h> and <utils/Log.h>"
am: 67519a5f72

Change-Id: I8e3aad87413722fb0d632695b636826eb9ce5533