Resolved conflicts.

Change-Id: I6ddad7de9e3047fc9ed93b44367f7f633831e3ea
Reviewed-on: https://swiftshader-review.googlesource.com/1350Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>