Merge voip from platform/frameworks/base to