Android CTS 6.0 Release 24 (4400446)
Merge "Srtp: Fix Android.mk mistake"