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

iEYEABECAAYFAlZw0PgACgkQ6K0/gZqxDnhKwACeIzu69JSgS2XzTCyAGsUM0EcK
e0AAn2ziL4C6X78DnyyDIqDbPdWh3a20
=DzgS
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"