Android NDK r21b (build 6352462)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXp4MVQAKCRDorT+BmrEO
eDWVAKCRrU/3++A7u8h3rMozOMO9UjpjqACbB59ll+fu1arwYj2lALNPgzI4aos=
=e4GR
-----END PGP SIGNATURE-----
Merge cherrypicks of [1163480, 1162728, 1163481, 1163482, 1163460, 1163461, 1163462] into ndk-release-r21

Change-Id: I3cd3d2563913d02ba4309c7d4b927d648e1ba33c