Merge "Add dependency on libdl_android"
am: 894180e071

Change-Id: Ib520bc4ce5e790f8aa554141c52bdf4b66f5b163