Merge "log/logd.h should point to log/log.h"