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

Change-Id: I00fcf4636ce5f64b938e7b075cbadad2a5abdc27
tree: ac1b932ea6f87b41b2e13a84c8417cfd6eda6e16
  1. src/
  2. Android.mk
  3. CleanSpec.mk