Merge "Merge "Merge "Add dependency on libdl_android" am: fb4396b6bd am: 09ff0f7a9b" into qt-dev-plus-aosp am: 46a1d47f5b"