Merge "Java 6 java.nio.Buffer changes." into dalvik-dev