Merge "Move useful core-libart_oj build rule"