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

Change-Id: I9ccccabeeadaf742ebb4e00264c9dfbd8e769e3c