surfaceflinger: Properly fix aliasing violations

Change-Id: I5eaaa57665a2b34eea9d42e0df77c6747332b04e