Merge "Remove unnecessary core-oj library"