[android] fix the LP32 armv7/i686 android build#846

jmschonfeld merged 3 commits intoswiftlang:mainswiftlang/swift-foundation:mainfrom

hyp:eng/android-lp32hyp/swift-foundation:eng/android-lp32Copy head branch name to clipboard