Merge voip from platform/frameworks/base to
tree: bd9d2ed8dbc74c83b3d96f4053f7e7c0c066b5d2
  1. java/
  2. jni/