am 844208a4: am b30c3b23: Merge "Revert "Unload oat files""

* commit '844208a4ed0c778cccf1d5c6ae55e976e50afbb7':
  Revert "Unload oat files"