Merge "Use correct StateSet for LayerVector compare." into pi-dev
am: 4f80b867b3

Change-Id: I698990676f963cb3f8f1d1d6e3e2ac6bd61a2d74