Merge "move classes out of native_loader.cpp"