Merge "Track BufferIterator changes in libcore"