Merge "Add dependency on libdl_android"
am: bf4ca215fe

Change-Id: I78381deb3462391caa1c668ee9c01d987ef35bcb