Merge "SurfaceFlinger: Enable -WConversion in Android.bp"