Merge "Use LOG_TAG instead of binary name as a tag." am: d535a9cab9
am: ed5448c4be

Change-Id: Ibfb245b5b8e50554d3aaba0158c6274b4e9cfe56