Fix wrapper equals()

Make it faster and correcter.

Bug 9204146

Change-Id: Ieeb97b72005e831ec6b94fc24ed2c3bc03307c2a
6 files changed