Android CTS 6.0 Release 23 (4337277)
Merge "Srtp: Fix Android.mk mistake"