Android CTS 6.0 Release 22 (4267323)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWa81FwAKCRDorT+BmrEO
eKWAAJ4hCIjHWvDQqV2EJJJU+VYWkWYhVACfaYqXhqTXpsDTZHa9MJQlQt0Fya4=
=wPVq
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"