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

am: 228793a0c9

Change-Id: I86aa0f62941802a7f26957d475575bf9c92ba2ca

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/libcore/io/BridgeBufferIterator.java

@@ -39,6 +39,11 @@ public class BridgeBufferIterator extends BufferIterator {
         mByteBuffer.position(offset);
     }
 
+    @Override
+    public int pos() {
+        return mByteBuffer.position();
+    }
+
     @Override
     public void skip(int byteCount) {
         int newPosition = mByteBuffer.position() + byteCount;