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

Change-Id: I90272c3a4538e35e8ae4a2dc99b215b2b60a2da0