Merge "Upgrade kotlinc to v1.3.61" am: e5d89a24a9 am: 8bdb8f0ff8

Change-Id: I5c20b428894a1f58839a9f83679fe793f58f536a