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

Change-Id: Ie08fb740f1c8683cdef7115937f448918cd29a4d