Merge "Remove unnecessary core-oj library"
am: a37bf5616a

Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db