Merge "Revert "Changes to support adding CTS Test TrustTestCases.""