Android CTS 6.0 Release 31 (4890202)
Merge "Srtp: Fix Android.mk mistake"