Merge "Label the dynamic linker in the runtime APEX correctly"