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

Change-Id: I371e64704a7e3b047b4ba53e0a7fbc8657d9dce5