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

Change-Id: I3f428afea07473992318daed6d1d440781751853