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

* commit 'b30c3b2332c60261d54a3741f49f6c6461b23ea4':
  Revert "Unload oat files"