Merge "Enable core-oj build with dx"