Android CTS 6.0 Release 25 (4485418)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWlVv3QAKCRDorT+BmrEO
eFSmAKCMg8VNEy9Jj7afBJfl/u1RfMZxZgCfSSeZXR8WHvx+CoRkYazgj0TTwDA=
=0LkK
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"