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