Update qtdiag to use renamed symbols

Change-Id: Ic2d40cf76efa63f12f2dde1a02c8938f355851b1
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Android: Fix deploy failed for debug mode

E/dalvikvm(10899): dlopen("/data/local/tmp/qt/lib/libQt5Quick.so") failed:
Cannot load library: soinfo_link_image(linker.cpp:1635): could not load
library "libQt5Qml.so" needed by "libQt5Quick.so";
caused by load_library(linker.cpp:745): library "libQt5Qml.so" not found

Task-number: QTBUG-38606
Change-Id: I8fcb42782a835842a69b0b4d2de4f1ed042555c6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I311a5d7b5177dd0cea49ed2d4d9125b27d3ba5e0