Merge "Add core-oj to the list of core library jars"