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

iEYEABECAAYFAlaEVygACgkQ6K0/gZqxDni7MACfYNWVKr1OBOp3RIgyHnlrRWkG
oy4AnjyeZDZ/wDfFbEy8tGgaW0cSLHxg
=b720
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"