Android CTS 6.0 release 5
Merge "Srtp: Fix Android.mk mistake"