Remove usages of deprecated code and bad assumptions from RdfBuilder

Change-Id: I47c99c5c73aa4d555d8b1edb948477d68ba1f65a
Merge "Remove usages of deprecated code and bad assumptions from RdfBuilder"