Merge "Revert "Allow CTS to find modules in subdir""