Android 6.0.1 release 4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlaK9BgACgkQ6K0/gZqxDnhN/QCfZmLyFRzrMTfsgodM3CANc8Fv
6xsAn1w8v0HGwP+q/9xmYJvf357ZXAZM
=wobq
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"