(matching vanilla changes:) Restructured things to allow org.ObjectLayout.intrinsifiable to NOT depend on org.ObjectLayout (thus allowing them to reside on different sides of the boot classpath).