Android CTS 6.0 Release 18 (3942491)
Merge "Srtp: Fix Android.mk mistake"