6730587: TEST: com/sun/jdi/MonitorFrameInfoTest.java fails with -server -Xcomp
Summary: Fix test to prevent C2 escape analysis from deleting the required synchronized blocks
Reviewed-by: swamyv
6681798: (build) CharsetEncoder.java fails to compile in openjdk6 on ubutu 8.04
Summary: replace awk-sed based spp.sh with a java regex based pre-processor
Reviewed-by: alanb