Merge "Remove obsolete mBufferEnd"