Android 6.0.1 Release 50 (MOB30P)
Merge "Srtp: Fix Android.mk mistake"