Merge "move classes out of native_loader.cpp"
am: 3c0d7e8d28

Change-Id: Ia0c5295e72ad7cc35b241a0a9aa13930e3e0eb38