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

Change-Id: If8abca3ce6df93ac4ab3be0a4b2f3011e25ffc88