Merge pull request swiftlang#24550 from drodriguez/android-enable-some-more-tests

[android] Enable some tests that should pass on Android.

Author: drodriguez

test/Interpreter/conditional_conformances_modules.swift

@@ -7,7 +7,7 @@
 
 // REQUIRES: executable_test
 // FIXME: seems to fail on 32-bit simulator?
-// REQUIRES: OS=macosx || OS=linux
+// REQUIRES: OS=macosx || OS=linux-gnu || OS=linux-androideabi || OS=linux-android
 
 import Basic
 import WithAssoc

test/stdlib/InputStream.swift.gyb

@@ -13,10 +13,6 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
-// FIXME: The Android test runner is incapable of running this test, which
-//        relies on stdin input.
-// UNSUPPORTED: OS=linux-androideabi
-
 import StdlibUnittest
 
 

validation-test/stdlib/Glibc.swift

@@ -5,9 +5,8 @@
 // UNSUPPORTED: OS=ios
 // UNSUPPORTED: OS=tvos
 // UNSUPPORTED: OS=watchos
-// UNSUPPORTED: OS=linux-androideabi
 
-// REQUIRES: OS=linux-gnu
+// REQUIRES-ANY: OS=linux-gnu, OS=linux-androideabi, OS=linux-android
 
 import Swift
 import StdlibUnittest

validation-test/stdlib/StringLowercasedUppercased.swift

@@ -5,7 +5,7 @@
 // directly.  It is not specific to Linux, it is just that on
 // Apple platforms we are using the NSString bridge right now.
 
-// REQUIRES: OS=linux-gnu
+// REQUIRES-ANY: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
 
 import StdlibUnittest