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

Change-Id: I49577518ba94b2878f161e5d78730950bfabeebe