Merge "Revert^2 "Use "SessionHint" enum in ndk API""