7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
Summary: Need to restore the vtable in metadata when we restore the type from the shared archive.
Reviewed-by: acorn, jcoomes, jmasa, jrose
7196167: NPG: mismerge in make/solaris/makefiles/fastdebug.make
Summary: Remove the workaround of 7187454 problem which was restored incorrectly during NPG merge.
Reviewed-by: coleenp, dholmes