Merge "Delete CodeItemIterator"
am: 5d16562752

Change-Id: I30735e0ce81a360616bcb4821ebe209113868361