Merge "Stop linking libdl.a into static bins"
am: fe43a3f2cb

Change-Id: I9209b793f37ac2a16294a50d2d83a0aa72134d28