Android CTS 6.0 release 2
Merge "Srtp: Fix Android.mk mistake"