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

Change-Id: Ia3621a5ed5cf9b6a9c1c094fabef068a97bb28cb