Merge "ART: Remove stale TODOs"
am: 72ac1ca53c

Change-Id: Ic26ef32ca7d8738c625a30dd6f444535f223f1ff