Merge "Upgrade kotlinc to v1.3.61" am: e5d89a24a9
am: 4b76748cc0

Change-Id: I7ce533fde7cc1d315758aa0e95dbc85af32017f1