Android 6.0.1 release 43 (MOB30J)
Merge "Srtp: Fix Android.mk mistake"