Revert "surfaceflinger: Work around aliasing violations"

This reverts commit b5d7fac919d690b4ff7ce63a7b9c621eb8f75943.

Change-Id: I6769d2e5cb8ee6806f7e51c704de7f0d958d8024
surfaceflinger: Properly fix aliasing violations

Change-Id: I5eaaa57665a2b34eea9d42e0df77c6747332b04e