Help mitigate merge conflicts as two people will be working on this at the same time.

Change-Id: I92534eb1c92ec9ce66178d6d669a473350a0c158
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28689Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>