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

* commit '84d3d765500f75f64ab0502ee2bea0f21b3ead2b':
  Revert "Unload oat files"