Android CTS 6.0 Release 12 (3417974)
Merge "Srtp: Fix Android.mk mistake"