Revert "Fix wp and sp comparison bugs"

This reverts commit 029b12ebde0b5a13b4b1252dc20b2ecc8194d5b7.

Reason for revert: There appear to be problems with null comparisons. Reported failure in HwcBufferCacheTest.

Change-Id: I19745bb281dabe8b05c2df3fe95e7be7a49dcd51
3 files changed