Merge "Remove and update code that was addressing old SwiftShader workarounds." into sc-dev am: eee0df00 am: 995a3a53

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13932189

Change-Id: Ie898fe4694bf60a001b9c4d476c8d88cdd62cbe9