*** old/src/share/vm/memory/universe.cpp	Thu Nov  3 14:16:42 2016
--- new/src/share/vm/memory/universe.cpp	Thu Nov  3 14:16:41 2016

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "aot/aotLoader.hpp"
  #include "classfile/classLoader.hpp"
  #include "classfile/classLoaderData.hpp"
  #include "classfile/javaClasses.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"

*** 669,678 ****
--- 670,681 ----
      return status;
    }
  
    Metaspace::global_initialize();
  
+   AOTLoader::universe_init();
+ 
    // Checks 'AfterMemoryInit' constraints.
    if (!CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::AfterMemoryInit)) {
      return JNI_EINVAL;
    }