Android 6.0.1 Release 70 (MOB31H)
Merge "Srtp: Fix Android.mk mistake"