Merge "Fix soinfo_tls::module dangling reference" am: 314c0f7989
am: 5e60f690d9

Change-Id: Iac0c3b827a97f77f76e2f84bd46ae0cbf8fefdee