During the Gerrit Hackathon, we learned some things about setting bazel options. Use the ones recommended in upstream docs rather than these. The outcome should be largely the same. Change-Id: I32b4c567488f0739fb80f69dc881b9837803575c