[automerger skipped] Explicitly include log/log.h instead of cutils/log.h am: 5302433b0a am: 833d8486f7
am: ea716c66fa -s ours
am skip reason: change_id Id8940e053c90c45ba39cdd27a44cc83f130487b7 with SHA1 51f1a220ec is in history

Change-Id: I57e71aac0688b7d70c98b18e6fd6234902fdac96