Merge "Fix the template parameter passed to some art::GetClassRoot uses."
am: 19759b28bc

Change-Id: Ia01c3a67a81561a0517ee60d43c4ac3d3d3b3e45