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

iEYEABECAAYFAlbd3tgACgkQ6K0/gZqxDnjhXACfTKVit94Pen2J09i1xTEBEzmK
/2IAn2xQSQTR+/+sY2pb7zCe1qs3qO4i
=MLgh
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"