Android 6.0.1 release 42 (MOB30I)
Merge "Srtp: Fix Android.mk mistake"