Merge "Use "SessionHint" enum in ndk API"