Merge "Excluding files in the test directory for Robolectric compilation" into main