Android 6.0.1 release 17
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlbd3qsACgkQ6K0/gZqxDnhjvwCeIEw5V0DMPNiXMOO5kSzKJ6D+
9cgAniQ5e+U4ccxMFe8pCCb89T1ye4kI
=Jl04
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"