Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201
am: dd65089678

Change-Id: Ica45e366d4413355f1081d25d1a3a942397dc1ac