Merge "Remove stale TODOs from Android.mk files."