Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev