Changes for b/20145724

Change-Id: I60164c1f98284bb87c89ffe890ca372ce1e98de6
Reviewed-on: https://swiftshader-review.googlesource.com/2830Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>