Merge "Add missing libdl dependencies" am: 1f984ce998
am: 3c9ffea95b

Change-Id: Ibd44607cf123f7e546f1aaa1c5e72f5ed6e23d69