Merge "Delete SurfaceFlinger BYPASS codepath" into oc-dev