Android 6.0.0 release 6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlZpvYMACgkQ6K0/gZqxDni3gACcDqVWpBVsRdBO4oUfeyl3Bb0Q
XT4AoIhuoUJp9hhm3yv54TJfxyJGMfqh
=TKAa
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"