Fixed information key initialization to be thread safe.

A long time ago, I had introduced a change to the way information
keys are initialized to address an issue on OS X 10.3. Since we
no longer support OS X 10.3 and we want key initialization to be
thread safe, I reverted that change.

Change-Id: Iaf7956a72c63957b9812569cf7eb092624b12999
Merge topic 'thread-safe-infokeys' into master

948bd014 Fixed information key initialization to be thread safe.