Android CTS 6.0 Release 9 (3102289)
Merge "Srtp: Fix Android.mk mistake"