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

iEYEABECAAYFAlYxAcQACgkQ6K0/gZqxDnjKGgCfXuzsxTe4mt24yXjUJcvxCmiQ
lHEAnArzFmI5LTV2pueoKu76JmAY6dlf
=qs/8
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"