Merge "Update TODOs for ICU library links."
am: b78de85272

Change-Id: I7c262dfbc07cabd592a8c7a08c6057de37fb3d63