Merge pull request #11659 from JosJuice/android-after-dirinit-runner-cleanup Android: Clean up AfterDirectoryInitializationRunner
