Android CTS 6.0 Release 21 (4214424)
Merge "Srtp: Fix Android.mk mistake"