Android wear 5.1.1 release 1
Merge "Srtp: Fix Android.mk mistake"