Android Wear N Preview 2 (NVD83H)
Merge "Srtp: Fix Android.mk mistake"