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

iEYEABECAAYFAlYxAZgACgkQ6K0/gZqxDngDDwCfUC5MftbhL598GFkPf0SrxbGu
tcMAn1xtFDjnP5JYnSUfes2u7wAKy+c/
=GDL0
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"