Use the moved version of PropertyDataTypeLookup and InMemoryDataTypeLookup

(Part of "Kill ALL of the Lib code!")

Change-Id: I69d9df29540e4f2090896eb10c5c9cc478762606
Merge "Use the moved version of PropertyDataTypeLookup and InMemoryDataTypeLookup"