Merge \\"Only add libdl dependency for ASan/TSan on target.\\" am: 3d8ee8896b
am: 2890414f78

Change-Id: I77a1824ebd28ad05ff635744e71e65259bf1e8f4