Android 6.0.1 Release 81 (MOI10E)
Merge "Srtp: Fix Android.mk mistake"