Merge "libcore: Add CTSv2 support for running OJ tests" into nyc-dev
am: b2a3ecb54c

* commit 'b2a3ecb54ceef57462d5c6c9102cb76a919f9174':
  libcore: Add CTSv2 support for running OJ tests

Change-Id: Ia45e0ded9a93cbcc692179575a0fda3227a56347