Merge "Add missing libdl dependencies" am: c7d0f96ab4 am: 9971517f9c am: 1104418d25
am: 6c94a8dff2

Change-Id: I03700fe987488c25c6330e2a1817bf227f0cca5f