Merge "Fix surfaceflinger on integer sanitized builds." am: 630fcaf0ab am: 0eabcad786
am: 043488d26c  -s ours

Change-Id: I28a7a09558016a55e09ee72b9e4416dcf91bccdc