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

Change-Id: Ifc4c1ada0299b430a74d98d05b9331182adf0933