Android CTS 6.0 Release 14 (3623550)
Merge "Srtp: Fix Android.mk mistake"