Android 6.0.1 release 40 (MOB30G)
Merge "Srtp: Fix Android.mk mistake"