Merge "Update iterators during aapt2 diff" into sc-dev