Android CTS 6.0 Release 15 (3666707)
Merge "Srtp: Fix Android.mk mistake"