[automerger skipped] Merge "Move the logic for creating APEX-related symlinks" am: cb7ac9d752 am: 26fc502a64
am: 424253f257 -s ours
am skip reason: change_id I92a52d0b5ef97e8cb4f780691f8594e40f2fa6b3 with SHA1 0ed52b789d is in history

Change-Id: I4786a1fae39f66ed149defc451a2c07e50e32c13