Merge pull request #12096 from Dentomologist/nandpaths_resolve_android_warning NandPaths: Resolve Android tautological comparison warning
