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

Change-Id: I0d7f3783cb1baba9c89f0c9ca6db173ab72d553b