Android CTS 6.0 release 1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlYTC7IACgkQ6K0/gZqxDngmRwCeJEmI7sTwngdhpcw2GZnuTe8m
V+AAn2mF8WYtSNH3c1YYZaV+fG73smPJ
=N40N
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"