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

* commit 'e064137d7bce4e76d23af98b5224b8332bc08b4d':
  [DO NOT MERGE] Create symlinks needed by chromiu_org build rules generated by gyp.