Android CTS 6.0 Release 28 (4717452)
Merge "Srtp: Fix Android.mk mistake"