* changes: Use core-oj alongside core-libart wherever required. Add core-oj to the list of dependencies