Fixes found while turning on A4A opt-in/out code.
Fixes found while turning on A4A opt-in/out code.

Bug: angleproject:2789
Change-Id: If9d83dd94d392103ed5200ba471d47dc907cf3ca
Reviewed-on: https://chromium-review.googlesource.com/1194612
Reviewed-by: Jamie Madill <7e492b4f1c8458024932de3ba475cbf015424c30@chromium.org>
Reviewed-by: Geoff Lang <b6fc25fe0362055230985c05cbfa8adb741ccc0f@chromium.org>
Commit-Queue: Ian Elliott <ac50c12f27752fd82643b0b72adab33538bb2c97@google.com>

ppy/angle,ppy/angle,ppy/angle,ppy/angle