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

Change-Id: Ib6869d36e2b0b4e8a079f4f6f3c2bbaa50b30be1