Attempt to fix PropertyInfoTableBuilderTest

This makes sure we are using consistent instances of EntityStore
and EntityLookup. The idea is to fix bug 66405, but it's really
a shot in the blue.

Bug: 66405
Change-Id: I53f250b5af34e60d9ff4f36f358b27d188a6c22d