Merge "Remove logcat, logd, and logwrapper symlinks"