Merge "Remove #include "oat_file.h" from class_linker.h ." am: 2f61867045 am: 6622934a0a
am: 40de464417

Change-Id: I6769b1b2c6f28314d096bf9c4fd17fe8987c8dd5