Merge "Revert "Remove logging symlinks from system/core/include""