This reverts commit 029b12ebde. Reason for revert: There appear to be problems with null comparisons. Reported failure in HwcBufferCacheTest. Change-Id: I19745bb281dabe8b05c2df3fe95e7be7a49dcd51
029b12ebde