Merge "Revert "Revert "Remove libdl exception from the test""" am: a20d7bb475
am: 2f698e6690

Change-Id: Iac9649cc80fd548d5cac9e77fd8a4a36d85af6e5