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