Android CTS 6.0 Release 27 (4606954)
Merge "Srtp: Fix Android.mk mistake"