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

Change-Id: Id1ebfdf2e2e6a558097c345542697acfbd7b5415