Android N Preview 4 (NPD56N)
Merge "Srtp: Fix Android.mk mistake"