Merge "Add core-oj to the list of core library jars" am: 458cfe9bec * commit '458cfe9becb16b9b7a90784b813ad628f3114e6d': Add core-oj to the list of core library jars