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

Change-Id: I9bb14bac27b49f6a008614c5f6b3c803959cf9d3