Merge "Fix surfaceflinger on integer sanitized builds."
am: bfbf7c2c9a

Change-Id: Iae676c5bfecfceb6f2c158755609c1331aa6a787