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

Change-Id: I779df143b3228de4341f0d76a5dac5d2b6604465