hg: jdk9/sandbox/jdk: Merge

[naoto.sato at oracle.com]

Changeset: 2e61324df11f
Author:    naoto
Date:      2015-05-29 15:33 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/2e61324df11f

Merge

- src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java
- test/java/lang/Character/UnicodeBlock/NonOptimalMapSize.java