With some core classes moved to separate core-oj jar we need to use the new jar. (cherry picked from commit 95815341) Change-Id: Iea17d734cc1cf1c2ac70a5bb81e77ba2eed0fabe