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

iEYEABECAAYFAlbglzMACgkQ6K0/gZqxDnhy1ACeITAnmEGl7yZms48jJTGxaWpx
WUcAmwTnCJiTDNABomFPaUDU7eoS4GLE
=OH3c
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"