Revert of Reland of 'Make allow_subannotations more robust'

Revert of Reland of 'Make allow_subannotations more robust' (patchset #2 id:20001 of https://codereview.chromium.org/1076643002/)

Reason for revert:
Makes the WebRTC Windows perf bots hang when the upload to the perf dashboard is about to happen.
Examples:
http://build.chromium.org/p/client.webrtc/builders/Win32%20Release%20%5Blarge%20tests%5D
http://build.chromium.org/p/chromium.webrtc.fyi/builders/Win7%20Tester
http://build.chromium.org/p/chromium.webrtc/builders/Win7%20Tester
http://build.chromium.org/p/chromium.webrtc/builders/Win8%20Tester
For some strange reason it only affects Win7 and 8, not XP.


Original issue's description:
> Reland of 'Make allow_subannotations more robust'
> 
> From here: http://crrev.com/1001183002#ps120001
> 
> This patch makes the recipe engine parse and re-emit subannotations when allow_subannotations is True.  This means that any of the subannotator's steps which are duplicates of other steps executed will be disambiguated.  When an allow_subannotations step is actually emits annotations, an (end) step is emitted after it is done to have something to hang metadata on (it also conveniently communicates when we re-enter recipes).
> 
> BUG=466409
> R=iannucci@chromium.org
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=294732

TBR=iannucci@chromium.org,luqui@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=466409
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=294738

[kjellander_chromium, 2015-04-09 12:49:46]

Created Revert of Reland of 'Make allow_subannotations more robust'

[commit-bot: I haz the power, 2015-04-09 12:49:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072823002/1

[commit-bot: I haz the power, 2015-04-09 12:50:08]

Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=294738