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

Change-Id: I7f54f08d26175c691bb59f5efd0ab36f77b74c83