Update BridgeBufferIterator to track libcore am: 23e48cb247
am: 70af9c51f0

Change-Id: I72e67a833e526871b865b4f9e67e0b64154dc1ee