Merge "Fix compilation error with new kotlinc" into qt-dev-plus-aosp