Merge "Delete SurfaceFlinger BYPASS codepath" into oc-dev
am: d8ac4fd17a

Change-Id: Ieae1107f4da7b4a3eaa489175bda4bdb62e9d245