Android NDK r21 Beta 2 (build 6011959)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXdwTLwAKCRDorT+BmrEO
eNbWAJ4/Z2M7tsUa5eLBCLl2VtP+4mXwcwCeNbUg+upEHKtP33Fl9DGhuXYbLRg=
=vy5a
-----END PGP SIGNATURE-----
Merge cherrypicks of [1163480, 1162728, 1163481, 1163482, 1163460, 1163461, 1163462] into ndk-release-r21

Change-Id: I3cd3d2563913d02ba4309c7d4b927d648e1ba33c