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

Change-Id: I1ab5925952e6881fe9148394e65a46345df3c801