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

Change-Id: Id6cb26d1af8a3e35af52ae0f070fdab8a38c8e69