Merge "frameworks/opt/net/voip: use proper nativehelper headers" am: eca3c26d49 am: 07e4fc6758
am: 47f9580aaa

Change-Id: I56874a2b9bcc9885d023239d3e77a32ff4b233a4