Copy updates from classlib copy of this file. git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk@925696 13f79535-47bb-0310-9956-ffa450edef68