Do TODOs related to Android/libc++

BUG=767901
R=thakis

Change-Id: Ie4cefe7b8169ab66ba18461397be31d64269f9ca
2 files changed