Merge "Fix typo in comment in CTS Libcore non-OJ test configuration." am: 7c97d0d749 am: ddcd23c654

Original change: https://android-review.googlesource.com/c/platform/cts/+/1679607

Change-Id: Ib0005ac5ba3c1e49d3077991b3b42d919b2e1021