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

Change-Id: I6e4f2c5003c6b9109cc1c09f31b2c1465116d17f