Merge "Update Kotlinc to 1.3.11" am: d934c6bcfc am: f8c2ba677c
am: 3c29aa12ab

Change-Id: I4012348595593d0f44aff2f84ac9f9a5d91a0b4e