Merge "Fix surfaceflinger on integer sanitized builds." am: bfbf7c2c9a am: 7600fb86f3
am: 3390fe6731  -s ours

Change-Id: Ia94cbf606b0cbab5a602a2a4e15873bd11927822