Merge "Centralize getCurrentThreadId to AndroidThreadInfo.cpp"