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

iEYEABECAAYFAlYyY84ACgkQ6K0/gZqxDnjzTwCeMYTEB3WU/P4bZjnn4JzFYJvv
jBYAnjqqmkQ4KQgqDTr5TtsMZI/X4ARj
=sS/9
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"