Merge "Use core-oj alongside core-libart wherever required."
am: e0bca041c2

* commit 'e0bca041c21693c30290feb63121e408a85bc8b0':
  Use core-oj alongside core-libart wherever required.