--- a/hotspot/src/share/vm/memory/universe.cpp	Sun Dec 11 12:05:57 2016 -0800
+++ b/hotspot/src/share/vm/memory/universe.cpp	Sun Dec 11 19:07:04 2016 -0800
@@ -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;