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

Change-Id: I49a439a93477b706f5c1bd9a8ccb1c6dd42ea196