Merge "Update and fix test for Android Security CVE-2018-9490" into qt-dev