Merge "Dynamic linker is explicitly added to runtime APEX" am: 9f55716cad
am: aabbd4dc4a

Change-Id: I003b4d128299acb831324a8681cd1d4f3e4fc43c