Android NDK r21 (build 6113669)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXh44jQAKCRDorT+BmrEO
eBoLAJ9MNBbUycq7/Niv5EthlbQI/CRSzQCfdLM5jpkVuf/cSxgs2BasGqGEkSM=
=cgma
-----END PGP SIGNATURE-----
Merge cherrypicks of [1163480, 1162728, 1163481, 1163482, 1163460, 1163461, 1163462] into ndk-release-r21

Change-Id: I3cd3d2563913d02ba4309c7d4b927d648e1ba33c