Merge "Add dependency on libdl_android" am: 50bd6f0eb9
am: 8681626153

Change-Id: Ie8a3ff2f0dd38d51c32c552216bb8c18065ab7bf