Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: a621f8a374
am: 32ae5db2ee
Change-Id: I03b897745f6662efd847900313e217e6464bf696
This commit is contained in: