Merge "Delete SurfaceFlinger BYPASS codepath"