de-macroize xmlhelp ContentProvider

Change-Id: I806cd7a263dbe37581c8845b4089a76a7d591628