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

Change-Id: I36c96ebb80af1fcc1740b40a7388d961025c938d