Revert of Fix TODOs related to SDK 24

Revert of Fix TODOs related to SDK 24 (patchset #2 id:20001 of https://codereview.chromium.org/2738663003/ )

Reason for revert:
BUG=699972
Original issue's description:
> Fix TODOs related to SDK 24
> 
> Originally from Issue 2427543003 written by hush
> 
> BUG=546762, 543272
> 
> Review-Url: https://codereview.chromium.org/2738663003
> Cr-Commit-Position: refs/heads/master@{#455347}
> Committed: https://chromium.googlesource.com/chromium/src/+/299bf5a2daf2784c7cdd2917483733e2262efb55

TBR=torne@chromium.org,ctzsm@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=546762, 543272
Review-Url: https://codereview.chromium.org/2745623003
Cr-Commit-Position: refs/heads/master@{#456094}
Committed: https://chromium.googlesource.com/chromium/src/+/b579d0a779919583b7f77793d2f47a23eab9c1c0

[boliu, 2017-03-10 17:00:35]

The CQ bit was checked by boliu@chromium.org

[boliu, 2017-03-10 17:00:36]

Created Revert of Fix TODOs related to SDK 24

[commit-bot: I haz the power, 2017-03-10 17:01:14]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-10 17:42:58]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1489165235739210, "parent_rev":
"fe8a1e6ad75ca7bca3a6145116e6658968cd0ef6", "commit_rev":
"b579d0a779919583b7f77793d2f47a23eab9c1c0"}

[commit-bot: I haz the power, 2017-03-10 17:43:52]

Description was changed from

==========
Revert of Fix TODOs related to SDK 24 (patchset #2 id:20001 of
https://codereview.chromium.org/2738663003/ )

Reason for revert:
BUG=699972

Original issue's description:
> Fix TODOs related to SDK 24
> 
> Originally from Issue 2427543003 written by hush
> 
> BUG=546762, 543272
> 
> Review-Url: https://codereview.chromium.org/2738663003
> Cr-Commit-Position: refs/heads/master@{#455347}
> Committed:
https://chromium.googlesource.com/chromium/src/+/299bf5a2daf2784c7cdd29174837...

TBR=torne@chromium.org,ctzsm@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=546762, 543272
==========

to

==========
Revert of Fix TODOs related to SDK 24 (patchset #2 id:20001 of
https://codereview.chromium.org/2738663003/ )

Reason for revert:
BUG=699972

Original issue's description:
> Fix TODOs related to SDK 24
> 
> Originally from Issue 2427543003 written by hush
> 
> BUG=546762, 543272
> 
> Review-Url: https://codereview.chromium.org/2738663003
> Cr-Commit-Position: refs/heads/master@{#455347}
> Committed:
https://chromium.googlesource.com/chromium/src/+/299bf5a2daf2784c7cdd29174837...

TBR=torne@chromium.org,ctzsm@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=546762, 543272

Review-Url: https://codereview.chromium.org/2745623003
Cr-Commit-Position: refs/heads/master@{#456094}
Committed:
https://chromium.googlesource.com/chromium/src/+/b579d0a779919583b7f77793d2f4...
==========

[commit-bot: I haz the power, 2017-03-10 17:43:53]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/b579d0a779919583b7f77793d2f4...