Merge "Revert "Revert "Add SupplementalProcess stubs and bootclasspath ...""