Merge "Make nist-sip compile against public SDK APIs"