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

iEYEABECAAYFAlYyY+IACgkQ6K0/gZqxDnih+ACfUoj386t7aAG7zQkIJnY4eBqT
7BQAn1AzW5Z6mRU5JKVUAQbSwV58wXVQ
=f3M5
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"