Merge "Fix naming to match the libart equivalent."