ByteBufferAsCharBuffer: Merged variants am: 2921f8147c  -s ours
am: e83ff853da

* commit 'e83ff853dad750cb81d7fa5a85f82e63adfb2fad':
  ByteBufferAsCharBuffer: Merged variants