Fix #3886 and #3887: drop remaining KitKat TODOs.

[seanlip]

Explanation

This PR fixes #3886 and fixes #3887 by dropping TODOs for those obsolete issues so that they can be fully closed.

Essential Checklist

• The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
• Any changes to scripts/assets files have their rationale included in the PR explanation.
• The PR follows the style guide.
• The PR does not contain any unnecessary code changes from Android Studio (reference).
• The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
• The PR is assigned to the appropriate reviewers (reference).

[adhiamboperes]

This LGTM.