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

Change-Id: I91afdc5871c5ada287dbda5cef3391320bb88173