Fix Wundefined-var-template warnings. Partially reverts commit df53be27. Bug: 28149048 Bug: 29823425 Test: m Test: m test-art-host Change-Id: Ib077312558f9e2f784859861c000fbac8375b3f5