am 0a1e1b93: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.31

* commit '0a1e1b933202b54d7ee7d2cc5a9ea8f8cd310554':
  Update makefiles after merge of Chromium at 30.0.1599.31