Merge "Revert "Move RSTest to compatibility library.""