Merge "Move APEX symlink creation to alternative module" am: e41489a9a1
am: 76ff6282e8

Change-Id: Ib39161f6690cf7ca914396eb06bb70ad5cce464f