No, we do not use maven_layout. The new source roots do work, but we just needed to subtract out one of the default patterns we aren't using.