Merge "Remove <log/logd.h> and <log/logger.h>"
am: 1d69860960

Change-Id: I56ee11d2e7e2c6b1be77310afcaa40df52563493