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

Change-Id: I55a7ea6b844fa0ba43dc42d2c342bf1867911d24