--- old/src/share/vm/memory/universe.cpp	2016-11-03 14:16:42.000000000 -0700
+++ new/src/share/vm/memory/universe.cpp	2016-11-03 14:16:41.000000000 -0700
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "aot/aotLoader.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.hpp"
@@ -671,6 +672,8 @@
 
   Metaspace::global_initialize();
 
+  AOTLoader::universe_init();
+
   // Checks 'AfterMemoryInit' constraints.
   if (!CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::AfterMemoryInit)) {
     return JNI_EINVAL;