Merge "Move the logic for creating APEX-related symlinks"
am: cb7ac9d752

Change-Id: Ia0a5e6be6c8a15fa5720e0087823677d389a887c