Merge pull request #10589 from JosJuice/android-more-init-checks Android: Use AfterDirectoryInitializationRunner more comprehensively
