Merge "Make nist-sip compile against public SDK APIs" am: 93dc2efaba
am: c9ee78f7e0

Change-Id: Ie03397c5a14ed1d55090a8d76b070e61a86007ec