Merge "Allow host bionic to use libdl_static"
am: a2af8bea8c

Change-Id: If8421dcd1a1a06dc4b2389c8ca11ce43ac2474ed