Reverted as hwui doesn't agree. This reverts commit 8a902d9f. Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a