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

Change-Id: I1fea19f6e370ec47b024514bb954a8910661db20