Merge "Explicitly include log/log.h instead of cutils/log.h"
am: 68222be667

Change-Id: I52c26b3bee5528e3a195404127cb839990e76be1