Android CTS 6.0 Release 17 (3866870)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljdo0EACgkQ6K0/gZqxDnj1LgCdHnin8js2zVz2XHUL3vNbEWBB
OqAAnjVydglR6oZL0Nong4inADV8+y2m
=TcOr
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"