Merge "Add dependency on libdl_android"
am: 24ac60ad50

Change-Id: I8ffc3beef3fa6659a781359f30a9fbaed258596a