Merge "Remove unnecessary core-oj library" am: a37bf5616a am: 00c0d436f4
am: d3802f9ff4

Change-Id: Ic4a6b40e2ff4a8a232b2f60c61765757262b2120