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

iEYEABECAAYFAldVtQkACgkQ6K0/gZqxDnj3XwCdEj0xqPB3RvIAXkO96mTdYNLZ
yeUAn3BakNCSC8O3qoCSf+q6tAd4pub5
=zY5p
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"