am 323a4f57: (-s ours) am 1fa97b44: (-s ours) Merge "Revert "[DO NOT MERGE] Create symlinks needed by chromiu_org build rules generated by gyp.""

* commit '323a4f572870bb81fbf84a9a50f97a95c21561cb':
  Revert "[DO NOT MERGE] Create symlinks needed by chromiu_org build rules generated by gyp."