Merge "Label the dynamic linker in the runtime APEX correctly" am: ec5a6ce810 am: cdb6889e8f
am: 2f327f748c

Change-Id: I9f7b09e9e0dca11d201c5d34fc33a95fc7d0ff43