Android CTS 6.0 Release 23 (4337277)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWdwLEwAKCRDorT+BmrEO
eHjNAJ0XAahVb7xTeVcC20QPeJcY6T/9rgCdGiqOjeGRMbgrGPLhRqacAz6H4Us=
=NpGR
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"