Merge "Fix surfaceflinger on integer sanitized builds."
am: 630fcaf0ab

Change-Id: I66a3bddfbb40bd4ade4a69e0a87e7019bf9577e9