Merge pull request #441 from grote/splitSourceDirs-npe

Handle null better for Android 13