Merge "Add a flag to forward options to Bazel"