Not that this helps your particular issue, but my ...

# android

[michaelsims]

Not that this helps your particular issue, but my team tends to avoid putting different versions of a particular class in separate source sets. Instead we use an interface and have all the alternate implementations in the main source set, but select the appropriate one via flavor-driven resource IDs. I.E. we use the variant folders only for configuration and keep all the code in main. The main reason for that is so when we are refactoring or navigating code we access all of the implementations at once.