Merge "Reland: "Remove logging symlinks from system/core/include""