am 111c8357: Removes code that is incompatible with google3, Velvet build rules.

* commit '111c83579a165fe9d8f915cda4e08de47e16c056':
  Removes code that is incompatible with google3, Velvet build rules.