Android 6.0.0 release 1
Merge "Srtp: Fix Android.mk mistake"