am 7598f145: Merge "Revert "Revert "Unload oat files"""

* commit '7598f145d4fd4219c14c6e2c8a03b34ce7943ffe':
  Revert "Revert "Unload oat files""