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

Change-Id: I6ad89667367f10999e0ed313303c4c5e53e5b78a