Upgrade kotlinc to v1.3.21
am: b7d59a16d8

Change-Id: Ibcdac879a0e12b81022e3e97c36b5606636b75c3