Merge "Fix multi-image TODOs in class linker, runtime, and oat file."