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

Change-Id: Ia0cf425cd0833f18818ca3919e4ecb9a5334fc5a