Merge "Add missing libdl dependencies"
am: 1f984ce998

Change-Id: I282965e10fa60df379657a3d7314e6f05543b184