[automerger skipped] Merge "Use correct StateSet for LayerVector compare." into pi-dev am: 4f80b867b3
am: 09781e246c  -s ours

Change-Id: I725eb8c04cfdc71ac0d90e72ce0e4185ac438905