Merge "Add missing libdl dependencies" am: c7d0f96ab4
am: 9971517f9c

Change-Id: I36643e0e991e10ca0dbedb7fd7d700013454ea2b