Merge "Add dependency on libdl_android"
am: 50bd6f0eb9

Change-Id: I825763e209007618071fe6ed053ad0224a299ed0