Merge "Add core-oj to the list of core library jars."
am: 7de829dfae

* commit '7de829dfae22e9be8aa973a721d59c48d7f6fe7d':
  Add core-oj to the list of core library jars.