Merge "Simplify the nio Buffer implementations, and fix MappedByteBuffer."