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

Change-Id: Ib8da28345bdc96fa00e8fcbea7d64342ef9401f4