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

Change-Id: Ic1f6f6c68e1bf6eab96f01f7f3c96b98a3af25d6