Remove deprecated EntityContentFactory::singleton

All use of this method was removed earlier

Change-Id: I93ef9378dad3f87a6b1004024661122c8808ad43
Merge "Remove deprecated EntityContentFactory::singleton"