Android CTS 6.0 Release 8 (3046108)
Merge "Srtp: Fix Android.mk mistake"