Merge "Add build number to aapt2 version" into qt-dev