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

Change-Id: I14852430067bfec9b5aefef3d91fb976ed50bab7