Merge "Rename <cutils/log.h> to <log/log.h>" am: b8b2e34518
am: 79629da71b

Change-Id: Ifa83e9859ee785275b1521ab9afa487a447de215