Explicitly include log/log.h instead of cutils/log.h
am: 23e024aec0

Change-Id: I241d50b275052ffd1f0fc79148e887c38ae6ff99