Revert of GN(android): Add work-around for "project database corrupted" error

Revert of GN(android): Add work-around for "project database corrupted" error (patchset #2 id:20001 of https://codereview.chromium.org/1407043010/ )

Reason for revert:
This also popped up on WebRTC: https://code.google.com/p/webrtc/issues/detail?id=5169

Original issue's description:
> GN(android): Add work-around for "project database corrupted" error
>
> Happens randomly when compiling java with enable_incremental_javac=true.
>
> BUG=551449
>
> Committed: https://crrev.com/b09587112b3c257f02b9bca2ad19d1a48919b74d
> Cr-Commit-Position: refs/heads/master@{#357904}

TBR=yfriedman@chromium.org,agrieve@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=551449
Committed: https://crrev.com/b846ee6f792433a243f0129d93061c955487eb62
Cr-Commit-Position: refs/heads/master@{#358094}

[jbudorick, 2015-11-05 18:32:03]

Created Revert of GN(android): Add work-around for "project database corrupted"
error

[commit-bot: I haz the power, 2015-11-05 18:33:43]

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

[commit-bot: I haz the power, 2015-11-05 18:34:59]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-11-05 18:35:49]

Patchset 1 (id:??) landed as
https://crrev.com/b846ee6f792433a243f0129d93061c955487eb62
Cr-Commit-Position: refs/heads/master@{#358094}

[agrieve, 2015-11-05 19:44:09]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1408213011/ by agrieve@chromium.org.

The reason for reverting is: reland with a fix.