Make EntityContentFactory rely on EntityHandler

EntityContentFactory should determine which ContentHandler to
use for a given kind of entity, then delegate any functionality
to that ContentHandler implementation.

Change-Id: I2b7269b2efb8c1f52aead1acfda199c04108e531
Merge "Make EntityContentFactory rely on EntityHandler"