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

iEYEABECAAYFAlcEAcYACgkQ6K0/gZqxDnhomQCfV83Ex8jqflC4O/97ydxRxY+0
OUkAn3MSB4FPMt+0Yqq8lCtZNss14rY1
=q7dR
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"