Fix incompatibilities with Kotlin 1.5.0

Test: make
Change-Id: I9bc49c759d0b2527b6419f5d711e394402a7e781
3 files changed