Improve kotlin to java type linking

Change-Id: Ice179b470af387a5f743010e288d393af1c78a17
6 files changed