Merge "Fix compilation error with new kotlinc" into qt-dev-plus-aosp am: 3d791f525a
am: 7d89a3b9c4

Change-Id: I927b808f399c772e084f6fd783d36496e14c3738