Merge "Remove dead code: NIOBuffer." into gingerbread