Merge "Move the logic for creating APEX-related symlinks"