Merge "Add lock guards to performance hint NDK" into main