Merge "Track BufferIterator changes in libcore" am: 021e8ff2af am: 4ff3c27817
am: 228793a0c9

Change-Id: I86aa0f62941802a7f26957d475575bf9c92ba2ca