Android NDK r20 (build 5594570)
Merge remote-tracking branch 'aosp/ndk' into update-from-master
am: f74d69a522

Change-Id: I1eedde061c2bf6a6a22f4d75703f600692560dfb