Android CTS 6.0 Release 20 (4120755)
Merge "Srtp: Fix Android.mk mistake"