tree c59a8fad5d4beacc50a86b7f155943ffde62b611
parent f658bf17d3a1170989d802aa52320dd5373d9749
author Ying Wang <wangying@google.com> 1448320964 -0800
committer Narayan Kamath <narayan@google.com> 1450791534 +0000

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.

(cherry picked from commit 96a54c42b4cee793a0d1174082f1d94c1342d1b3)

Change-Id: I693babc2a4d8ad16005f6e7b4a65866996be6300