Follow cm's frameworks/opt/net/ims

Change-Id: I326d2d6535d9e224ce941f7f568c879ab94654bf