Merge jdk7u6-b20 langtools