Explicitly include log/log.h instead of cutils/log.h am: 9a5fa818d4 am: b8e4109efc
am: 511e3e8907

Change-Id: Ia343b5fa0caf2ed095b5f52ba695c157ceed6b4a