Merge "Revert "Add a trivial kotlin test to LibcoreCtsTestCases."" am: ee9a1db6cd
am: 50c86c2561

Change-Id: I3d52310411435dfa155c0cf78d27b79f31e2bad8