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

Change-Id: Ifd187a18923c661a47570cb45c205dab712bc060