Use core-oj alongside core-libart wherever required.

With some core classes moved to separate core-oj jar
we need to use the new jar.

Change-Id: I2ed9561c46c8b4289007add5dd31551b6b5b2fc8
1 file changed