Merge "log/logd.h should point to log/log.h"
am: d97efe0383

Change-Id: I5fbbe7f957f303fb61d60177474f615c9f3e7c25