Android NDK r21e (7075529)
Merge cherrypicks of [1163480, 1162728, 1163481, 1163482, 1163460, 1163461, 1163462] into ndk-release-r21

Change-Id: I3cd3d2563913d02ba4309c7d4b927d648e1ba33c