Android CTS 6.0 Release 30 (4844167)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW05qHgAKCRDorT+BmrEO
eKosAJ9OIRNcqEdvU1uPK6vb7c4qzHpGzwCfcqvmI/y0OQBNQrwSZOl3sDkJRVA=
=AB+d
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"