Merge "Remove <log/logd.h> and <log/logger.h>"