Android CTS 6.0 Release 21 (4214424)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlmErp8ACgkQ6K0/gZqxDnhjkgCffxlJmkhVsbi2vKPQHnL9NeTR
2ioAn149G9QeOsyBWa2lZJ53ENGPyHXu
=Fd/3
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"